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

DTP

Author: laurelfan

blockly/README.md

@@ -109,18 +109,25 @@ grunt test
 To run an individual test, use the `--grep` option to target a file or Mocha `describe` identifier:
 
 ```
-grunt test --grep myTestName # e.g., 2_11, or requiredBlockUtils
+grunt mochaTest --grep myTestName # e.g., 2_11, or requiredBlockUtils
 ```
 
 To debug tests using the node-inspector Chrome-like debugger:
 
 ```
 npm install -g node-inspector
 node-inspector &
-# open debugger URL
-node --debug-brk $(which grunt) --grep='testname'
+# open debugger URL, i.e. http://127.0.0.1:8080/debug?port=5858
+node --debug-brk $(which grunt) mochaTest --grep='testname'
 # This will breakpoint your inspector at the beginning of that test
 ```
+Not there are two classes of mochaTests we have. The first class run in the same process as grunt, and the above commands will work a expected.
+For the second class, we launch a new node process, which your debugger will not have broken on. To debug this second class, we added a --dbg
+command that will break the debugger on the node process launch on port 5859.
+```
+grunt mochaTest --grep='testname' --dbg
+# open debugger URL on port 5859, i.e. http://127.0.0.1:8080/debug?port=5859
+```
 
 - You can add new test files as /test/*Tests.js, see `/test/feedbackTests.js` as an example of adding a mock Blockly instance
 - Blockly tests typically target built files in the `build/js` folder

dashboard/app/helpers/levels_helper.rb

@@ -83,7 +83,7 @@ def select_and_remember_callouts(always_show = false)
         end
       end
     else
-      available_callouts = @script_level.available_callouts if @script_level
+      available_callouts = @script_level.callouts if @script_level
     end
     @callouts_to_show = available_callouts
       .reject { |c| !always_show && session[:callouts_seen].include?(c.localization_key) }

dashboard/app/models/callout.rb

@@ -1,6 +1,6 @@
 class Callout < ActiveRecord::Base
   include Seeded
-  belongs_to :script_level
+  belongs_to :script_level, inverse_of: :callouts
 
   CSV_HEADERS = 
   {

dashboard/app/models/hint.rb

@@ -30,6 +30,11 @@ class Script < ActiveRecord::Base
   FLAPPY_NAME = 'flappy'
   TWENTY_HOUR_NAME = '20-hour'
 
+  COURSE1_NAME = 'course1'
+  COURSE2_NAME = 'course2'
+  COURSE3_NAME = 'course3'
+  COURSE4_NAME = 'course4'
+
   def Script.twenty_hour_script
     Script.get_from_cache(Script::TWENTY_HOUR_ID)
   end
@@ -66,9 +71,11 @@ def self.script_cache_to_redis
 
   def self.script_cache_from_db
     {}.tap do |cache|
-        [FLAPPY_ID, TWENTY_HOUR_ID, PLAYLAB_NAME, HOC_NAME, FROZEN_NAME].each do |id|
+        [TWENTY_HOUR_ID,
+         FLAPPY_ID, PLAYLAB_NAME, HOC_NAME, FROZEN_NAME,
+         COURSE1_NAME, COURSE2_NAME, COURSE3_NAME, COURSE3_NAME].each do |id|
           find_by = (id.to_i.to_s == id.to_s) ? :id : :name
-          script = Script.includes([{script_levels: [{level: [:game, :concepts] }, :stage]}, :stages]).
+          script = Script.includes([{script_levels: [{level: [:game, :concepts] }, :stage, :callouts]}, :stages]).
             find_by(find_by => id)
           cache[script.name] = script
           cache[script.id.to_s] = script

dashboard/app/models/script.rb

@@ -5,6 +5,7 @@ class ScriptLevel < ActiveRecord::Base
   belongs_to :script, inverse_of: :script_levels
   belongs_to :stage, inverse_of: :script_levels
   acts_as_list scope: :stage
+  has_many :callouts, inverse_of: :script_level
 
   NEXT = 'next'
 
@@ -115,15 +116,4 @@ def self.cache_find(id)
     @@script_level_map ||= ScriptLevel.includes([{level: [:game, :concepts]}, :script]).index_by(&:id)
     @@script_level_map[id]
   end
-
-  def available_callouts
-    @@available_callouts ||= {}
-    @@available_callouts[self.id] ||=
-      Callout.where(script_level_id: self.id).select(:id, :element_id, :qtip_config, :localization_key)
-    return @@available_callouts[self.id]
-  end
-
-  def self.clear_available_callouts_cache
-    @@available_callouts = {}
-  end
 end

dashboard/app/models/script_level.rb

@@ -10,8 +10,6 @@ class ScriptLevelsControllerTest < ActionController::TestCase
     @admin = create(:admin)
     sign_in(@admin)
 
-    ScriptLevel.clear_available_callouts_cache
-    
     @script = Script.find(Script::TWENTY_HOUR_ID)
     @script_level = @script.script_levels.fifth
 
@@ -275,24 +273,22 @@ class ScriptLevelsControllerTest < ActionController::TestCase
 
     sign_out(@admin)
 
-    stage = create :stage, script: Script.find_by_name('course1')
-    level = create :unplugged, name: 'NewUnplugged', type: 'Unplugged'
-    @script_level = create(:script_level, stage: stage, script: stage.script, level: level)
+    script_level = Script.find_by_name('course1').script_levels.first
 
-    get :show, script_id: @script_level.script, stage_id: stage.position, id: @script_level.position
+    get :show, script_id: script_level.script, stage_id: script_level.stage.position, id: script_level.position
 
     assert_response :success
 
-    assert_select 'div.unplugged > h2', 'Test title'
-    assert_select 'div.unplugged > p', 'Test description'
+    assert_select 'div.unplugged > h2', 'Happy Maps'
+    assert_select 'div.unplugged > p', 'Students create simple algorithms (sets of instructions) to move a character through a maze using a single command.'
     assert_select '.pdf-button', 2
 
-    unplugged_curriculum_path_start = "curriculum/#{stage.script.name}/#{stage.position}"
+    unplugged_curriculum_path_start = "curriculum/#{script_level.script.name}/#{script_level.stage.position}"
     assert_select '.pdf-button' do
       assert_select "[href=?]", /.*#{unplugged_curriculum_path_start}.*/
     end
 
-    assert_equal @script_level, assigns(:script_level)
+    assert_equal script_level, assigns(:script_level)
   end
 
   test "show redirects to canonical url for custom scripts" do
@@ -343,11 +339,16 @@ class ScriptLevelsControllerTest < ActionController::TestCase
   test "should select only callouts for current script level" do
     @controller.expects :slog
 
-    callout1 = create(:callout, script_level: @script_level)
-    callout2 = create(:callout, script_level: @script_level)
+    script = create(:script)
+    level = create(:level, :blockly, user_id: nil)
+    stage = create(:stage, script: script)
+    script_level = create(:script_level, script: script, level: level, stage: stage)
+
+    callout1 = create(:callout, script_level: script_level)
+    callout2 = create(:callout, script_level: script_level)
     irrelevant_callout = create(:callout)
 
-    get :show, script_id: @script.id, id: @script_level.id
+    get :show, script_id: script.name, stage_id: stage.position, id: script_level.position
 
     assert(assigns(:callouts_to_show).include?(callout1))
     assert(assigns(:callouts_to_show).include?(callout2))
@@ -357,8 +358,15 @@ class ScriptLevelsControllerTest < ActionController::TestCase
   test "should localize callouts" do
     @controller.expects :slog
 
-    create(:callout, script_level: @script_level, localization_key: 'run')
-    get :show, script_id: @script_level.script_id, id: @script_level.id
+    script = create(:script)
+    level = create(:level, :blockly, user_id: nil)
+    stage = create(:stage, script: script)
+    script_level = create(:script_level, script: script, level: level, stage: stage)
+
+    create(:callout, script_level: script_level, localization_key: 'run')
+
+    get :show, script_id: script.name, stage_id: stage.position, id: script_level.position
+
     assert assigns(:callouts).find{|c| c['localized_text'] == 'Hit "Run" to try your program'}
   end
 
@@ -370,7 +378,7 @@ class ScriptLevelsControllerTest < ActionController::TestCase
     stage = create(:stage, script: script)
     script_level = create(:script_level, script: script, level: level, stage: stage)
 
-    get :show, script_id: script.name, stage_id: stage, id: script_level.position
+    get :show, script_id: script.name, stage_id: stage.position, id: script_level.position
 
     assert_equal script_level, assigns(:script_level)
 
@@ -380,8 +388,15 @@ class ScriptLevelsControllerTest < ActionController::TestCase
   test "with callout defined should define callout JS" do
     @controller.expects :slog
 
-    create(:callout, script_level: @script_level)
-    get :show, script_id: @script.id, id: @script_level.id
+    script = create(:script)
+    level = create(:level, :blockly, user_id: nil)
+    stage = create(:stage, script: script)
+    script_level = create(:script_level, script: script, level: level, stage: stage)
+
+    create(:callout, script_level: script_level)
+
+    get :show, script_id: script.name, stage_id: stage.position, id: script_level.position
+
     assert(@response.body.include?('Drag a \"move\" block and snap it below the other block'))
   end
 

dashboard/test/controllers/script_levels_controller_test.rb

@@ -94,26 +94,38 @@ def no_database
 
 
   # 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
+   test "should get show of course1 level 1 twice" do
+     get '/s/course1/stage/3/puzzle/1'
+     assert_response :success
 
-  #   no_database
+     no_database
 
-  #   get '/s/course1/stage/1/puzzle/10'
-  #   assert_response :success
-  # end
+     get '/s/course1/stage/3/puzzle/1'
+     assert_response :success
+   end
 
-  # test "post milestone to course1" do
-  #   sl = Script.find_by_name('course1').script_levels[2]
+  # course1 caching across levels is not working yet
+   # test "should get show of course1 level 1 and then level 10" do
+   #   get '/s/course1/stage/3/puzzle/1'
+   #   assert_response :success
 
-  #   post "milestone/0/#{sl.id}"
-  #   assert_response 200
+   #   no_database
 
-  #   no_database
+   #   get '/s/course1/stage/3/puzzle/10'
+   #   assert_response :success
+   # end
 
-  #   post "milestone/0/#{sl.id}"
-  #   assert_response 200
-  # end
+   test "post milestone to course1 passing" do
+     sl = Script.find_by_name('course1').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
 
 end