some more caching tests

Author: laurelfan

dashboard/app/controllers/activities_controller.rb

@@ -47,7 +47,6 @@ def milestone
 
     # Store the image only if the image is set, and the image has not been saved
     if params[:image] && @level_source.try(:id)
-      # don't create new level source images temporarily
       @level_source_image = LevelSourceImage.find_by(level_source_id: @level_source.id)
       unless @level_source_image
         @level_source_image = LevelSourceImage.new(level_source_id: @level_source.id)

dashboard/app/models/level_source.rb

@@ -1,9 +1,5 @@
 require 'digest/md5'
 
-def level_source_cache()
-  @@level_sources_redis ||= rack_env?(:production) ? Redis.connect(url:CDO.level_sources_redis_url) : Hash.new
-end
-
 # A specific solution attempt for a specific level
 class LevelSource < ActiveRecord::Base
   belongs_to :level
@@ -19,12 +15,20 @@ class LevelSource < ActiveRecord::Base
   # A level_source is considered to be standardized if it does not have this.
   XMLNS_STRING = ' xmlns="http://www.w3.org/1999/xhtml"'
 
+  def LevelSource.cache_enabled?
+    rack_env?(:production) || @@cache_enabled
+  end
+
+  def LevelSource.level_source_cache()
+    @@level_sources_redis ||= rack_env?(:production) ? Redis.connect(url:CDO.level_sources_redis_url) : Hash.new
+  end
+
   def self.find_identical_or_create(level, data)
     md5 = Digest::MD5.hexdigest(data)
 
     redis_key = "v5-#{level.id}-#{md5}"
 
-    cached_json = level_source_cache[redis_key] if rack_env?(:production)
+    cached_json = LevelSource.level_source_cache[redis_key] if LevelSource.cache_enabled?
     level_source_object = OpenStruct.new(JSON.parse(cached_json)) if cached_json
 
     unless level_source_object
@@ -34,7 +38,7 @@ def self.find_identical_or_create(level, data)
       return nil unless level_source_object
 
       level_source_hash = {id:level_source_object.id, hidden:level_source_object.hidden}
-      level_source_cache[redis_key] = level_source_hash.to_json if rack_env?(:production)
+      LevelSource.level_source_cache[redis_key] = level_source_hash.to_json if LevelSource.cache_enabled?
 
       level_source_object = OpenStruct.new(level_source_hash)
     end

dashboard/app/views/shared/_user_stats.html.haml

@@ -1,5 +1,5 @@
 - script = @script || (user && user.primary_script) || Script.twenty_hour_script
-- script_levels = user ? user.levels_from_script(script) : script.script_levels.includes(:script, :stage, level: :game)
+- script_levels = user ? user.levels_from_script(script) : script.script_levels
 -# concept_progress = user ? user.concept_progress : nil
 
 .user-stats-block

dashboard/config/environments/test.rb

@@ -43,4 +43,7 @@
 
   # disable this for test by default, it won't make much sense if we keep wiping the db
   CDO.disable_s3_image_uploads = true
+
+  # see stack traces around sql queries in the log
+  ActiveRecordQueryTrace.enabled = true
 end

dashboard/test/integration/caching_test.rb

@@ -1,20 +1,36 @@
 require 'test_helper'
 
 class CachingTest < ActionDispatch::IntegrationTest
-  
-  setup do
-    Script.send(:clear_cache)
+
+  def setup
+    Script.clear_cache
+    LevelSource.class_variable_set(:@@cache_enabled, true)
   end
-  
-  test "should get show of frozen level 1" do
-    get '/s/frozen/stage/1/puzzle/1'
-    assert_response :success
 
+  def no_database
     Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
+    Rails.logger.info 'DISCONNECTING DATABASE'
     Rails.logger.info '--------------'
 
     ActiveRecord::Base.connection.disconnect!
+  end
+
+  test "should get /s/frozen" do
+    get '/s/frozen'
+    assert_response :success
+
+    no_database
+
+    get '/s/frozen'
+    assert_response :success
+  end
+  
+  test "should get show of frozen level 1" do
+    get '/s/frozen/stage/1/puzzle/1'
+    assert_response :success
+
+    no_database
+
     get '/s/frozen/stage/1/puzzle/1'
     assert_response :success
   end
@@ -23,11 +39,8 @@ class CachingTest < ActionDispatch::IntegrationTest
     get '/s/frozen/stage/1/puzzle/10'
     assert_response :success
 
-    Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
-    Rails.logger.info '--------------'
-    
-    ActiveRecord::Base.connection.disconnect!
+    no_database
+
     get '/s/frozen/stage/1/puzzle/10'
     assert_response :success
   end
@@ -36,11 +49,8 @@ class CachingTest < ActionDispatch::IntegrationTest
     get '/s/frozen/stage/1/puzzle/20'
     assert_response :success
 
-    Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
-    Rails.logger.info '--------------'
-    
-    ActiveRecord::Base.connection.disconnect!
+    no_database
+
     get '/s/frozen/stage/1/puzzle/20'
     assert_response :success
   end
@@ -50,28 +60,60 @@ class CachingTest < ActionDispatch::IntegrationTest
     get '/s/frozen/stage/1/puzzle/1'
     assert_response :success
 
-    Rails.logger.info '--------------'
-    Rails.logger.info 'SECOND REQUEST'
-    Rails.logger.info '--------------'
-    
-    ActiveRecord::Base.connection.disconnect!
+    no_database
+
     get '/s/frozen/stage/1/puzzle/10'
     assert_response :success
   end
 
+  test "post milestone to frozen passing" do
+    sl = Script.find_by_name('frozen').script_levels[2]
+    params = {program: 'fake program', testResult: 100, result: 'true'}
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+
+    no_database
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+  end
+
+  test "post milestone to frozen failing" do
+    sl = Script.find_by_name('frozen').script_levels[2]
+    params = {program: 'fake program', testResult: 5, result: 'false'}
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+
+    no_database
+
+    post "milestone/0/#{sl.id}", params
+    assert_response 200
+  end
+
 
   # course1 is not caching yet
   # test "should get show of course1 level 1 and then level 10" do
   #   get '/s/course1/stage/1/puzzle/1'
   #   assert_response :success
 
-  #   Rails.logger.info '--------------'
-  #   Rails.logger.info 'SECOND REQUEST'
-  #   Rails.logger.info '--------------'
-    
-  #   ActiveRecord::Base.connection.disconnect!
+  #   no_database
+
   #   get '/s/course1/stage/1/puzzle/10'
   #   assert_response :success
   # end
 
+  # test "post milestone to course1" do
+  #   sl = Script.find_by_name('course1').script_levels[2]
+
+  #   post "milestone/0/#{sl.id}"
+  #   assert_response 200
+
+  #   no_database
+
+  #   post "milestone/0/#{sl.id}"
+  #   assert_response 200
+  # end
+
 end