Merge pull request code-dot-org#836 from code-dot-org/test

DTP

Author: laurelfan

aws/build.rake

@@ -158,6 +158,9 @@ $websites = build_task('websites', [deploy_dir('rebuild'), BLOCKLY_COMMIT_TASK])
     RakeUtils.system 'rake', 'build'
 
     if rack_env?(:production) && CDO.daemon
+      HipChat.log "Putting <b>dashboard</b> scripts in redis..."
+      RakeUtils.rake 'seed:script_cache_to_redis'
+
       thread_count = 1 + (CDO.app_servers.keys.count / 10)
       threaded_each CDO.app_servers.keys, thread_count do |name|
         upgrade_frontend name, CDO.app_servers[name]

dashboard/app/models/script.rb

@@ -73,15 +73,34 @@ def starting_level
     candidate_level
   end
 
-  def self.script_cache
-    @@script_cache ||= {}.tap do |cache|
+  def self.redis
+    @@redis ||= CDO.level_sources_redis_url ? Redis.connect(url:CDO.level_sources_redis_url) : Hash.new
+  end
+
+  def self.script_cache_from_redis
+    if marshalled = self.redis['script-cache']
+      Script.connection # rails doesn't load the mysql libraries unless you ask it to, this confuses Marshal
+      Marshal.load marshalled
+    end
+  end
+
+  def self.script_cache_to_redis
+    redis['script-cache'] = Marshal.dump(script_cache_from_db)
+  end
+
+  def self.script_cache_from_db
+    {}.tap do |cache|
       [twenty_hour_script, frozen_script, hoc_script, flappy_script, playlab_script].each do |script|
         cache[script.name] = script
         cache[script.id.to_s] = script
       end
     end
   end
 
+  def self.script_cache
+    @@script_cache ||= script_cache_from_redis || script_cache_from_db
+  end
+
   def self.get_from_cache(id)
     if self.script_cache[id.to_s]
       self.script_cache[id.to_s]

dashboard/app/models/user.rb

@@ -560,14 +560,14 @@ def track_script_progress(script)
 
       update = {}
       update[:started_at] = time_now unless user_script.started_at
-      update[:last_progress_at] = time_now 
+      update[:last_progress_at] = time_now unless user_script.last_progress_at
 
       if !user_script.completed_at && user_script.check_completed?
         update[:completed_at] = time_now
       end
 
       # update_all bypasses validations/transactions/etc
-      UserScript.where(id: user_script.id).update_all(update)
+      UserScript.where(id: user_script.id).update_all(update) unless update.empty?
     end
   end
 

dashboard/lib/tasks/seed.rake

@@ -295,4 +295,8 @@ namespace :seed do
 
   task all: [:videos, :concepts, :scripts, :trophies, :prize_providers, :callouts, STANFORD_HINTS_IMPORTED, :secret_words, :secret_pictures]
   task incremental: [:videos, :concepts, :scripts_incremental, :trophies, :prize_providers, :callouts, STANFORD_HINTS_IMPORTED, :secret_words, :secret_pictures]
+
+  task script_cache_to_redis: :environment do
+    Script.script_cache_to_redis
+  end
 end

dashboard/test/controllers/activities_controller_test.rb

@@ -333,7 +333,7 @@ def studio_program_with_text(text)
     assert_equal @script_level.script, user_script.script
     assert_equal @user, user_script.user
     assert_equal script_start_date.to_i, user_script.started_at.to_i
-    assert user_script.started_at != user_script.last_progress_at
+#    assert user_script.started_at != user_script.last_progress_at # I turned off updates 
     assert user_script.assigned_at.nil?
     assert user_script.completed_at.nil?
   end

dashboard/test/controllers/level_sources_controller_test.rb

@@ -5,9 +5,6 @@ class LevelSourcesControllerTest < ActionController::TestCase
     @admin = create(:admin)
     @level_source = create(:level_source)
     @hidden_level_source = create(:level_source, hidden: true)
-
-    # so we actually test this
-    CDO.disable_s3_image_uploads = false
   end
 
   test "should get edit" do

dashboard/test/models/script_test.rb

@@ -208,4 +208,13 @@ def setup
       artist.get_script_level_by_stage_and_position(11, 1)
     end
   end
+
+  test 'gets script cache from redis (or fake redis)' do
+    Script.script_cache_to_redis # in test this is just a hash
+
+    Script.connection.disconnect!     # we don't need no stinkin db
+
+    assert_equal 'Flappy', Script.get_from_cache('flappy').script_levels[3].level.game.name
+    assert_equal 'anna', Script.get_from_cache('frozen').script_levels[5].level.skin
+  end
 end

dashboard/test/test_helper.rb

@@ -25,6 +25,8 @@ class ActiveSupport::TestCase
 
   setup do
     set_env :test
+
+    AWS::S3.stubs(:upload_to_bucket).raises("Don't actually upload anything to S3 in tests... mock it if you want to test it")
   end
 
   teardown do

pegasus/sites.v3/hourofcode.com/public/prizes.md

@@ -46,7 +46,7 @@ One lucky school in ***every*** U.S. state (+ Washington D.C.) won $10,000 worth
 7:30 AM PST - [Cory Booker](http://www.youtube.com/watch?v=wD0Heuvv87I) <br />
 10:00 AM PST - [JR Hildebrand](http://www.youtube.com/watch?v=DfhAdnosy58) <br />
 11:00 AM PST - [Clara Shih](http://www.youtube.com/watch?v=2p7uhb1qulA) <br />
-12:00 PM PST - [Jessica Alba](http://www.youtube.com/watch?v=Kxm7PK-iS3c) <br />
+12:00 PM PST - [Jessica Alba](http://youtu.be/m4oEbAQbWCE) <br />
 
 **THURSDAY**, December 11 <br />
 5:30 AM PST - [Karlie Kloss](http://www.youtube.com/watch?v=6SzsRGTmjy0) <br />