Merge pull request #36149 from code-dot-org/dtl_candidate_018471b1

code-dot-org · Aug 4, 2020 · 3ca0031 · 3ca0031
2 parents d4a2c66 + 018471b
commit 3ca0031
Show file tree

Hide file tree

Showing 249 changed files with 26,099 additions and 247 deletions.
diff --git a/bin/reset_flakiness b/bin/reset_flakiness
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+# Resets the timestamp for checking UI test flakiness in SauceLabs.
+# This timestamp corresponds to the "from" parameter when requesting jobs from
+# SauceLabs in bin/test_flakiness: https://wiki.saucelabs.com/display/DOCS/Job+Methods
+#
+# Recommended usage: Run this script and commit the artifact file, describing why
+# you are resetting UI test flakiness in your commit message.
+
+require_relative '../deployment'
+require 'cdo/test_flakiness'
+require 'optparse'
+
+options = {timestamp: Time.now.to_i}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+  opts.on('-t', '--timestamp T', 'Unix timestamp to begin tracking flakiness. Optional, defaults to now.') do |t|
+    options[:timestamp] = Integer(t)
+  end
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+end.parse!
+
+TestFlakiness.reset(options[:timestamp])
diff --git a/dashboard/app/models/user_level.rb b/dashboard/app/models/user_level.rb
@@ -14,6 +14,7 @@
 #  submitted        :boolean
 #  readonly_answers :boolean
 #  unlocked_at      :datetime
+#  time_spent       :integer
 #
 # Indexes
 #

diff --git a/dashboard/app/models/validated_user_level.rb b/dashboard/app/models/validated_user_level.rb
diff --git a/dashboard/config/scripts/levels/(joshl) Dance Party 1-validated_2019.level b/dashboard/config/scripts/levels/(joshl) Dance Party 1-validated_2019.level
diff --git a/dashboard/config/scripts/levels/CSTAdata1b.level b/dashboard/config/scripts/levels/CSTAdata1b.level
diff --git a/dashboard/config/scripts/levels/Code Break E12 Practice.level b/dashboard/config/scripts/levels/Code Break E12 Practice.level
diff --git a/dashboard/config/scripts/levels/CodeBreak E02 Beg Challenge 2.level b/dashboard/config/scripts/levels/CodeBreak E02 Beg Challenge 2.level
diff --git a/dashboard/config/scripts/levels/CodeBreak E05 Beg Challenge1.level b/dashboard/config/scripts/levels/CodeBreak E05 Beg Challenge1.level
@@ -53,7 +53,7 @@
     "block_pools": [
       "GamelabJr"
     ],
-    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\",\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\",\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\": {\r\n      \"name\": \"purple monster\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/spritelab/CdlNOvtih6CV7QUekCCPH7e11tMwCGQh/category_characters/purple_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 2,\r\n      \"version\": null\r\n    },\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\": {\r\n      \"name\": \"purple monster_copy_2\",\r\n      \"sourceUrl\": \"https://levelbuilder-studio.code.org/v3/animations/VMkrxJPPGixIsTbGRHNrmw/dd16fbf1-c73f-4b26-aafb-be2810a01d5c.png?version=oycOMmpMYUlbuvr1vxX5HsKyTRXYAebW\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"oycOMmpMYUlbuvr1vxX5HsKyTRXYAebW\"\r\n    },\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\": {\r\n      \"name\": \"purple monster_copy_1\",\r\n      \"sourceUrl\": \"https://levelbuilder-studio.code.org/v3/animations/VMkrxJPPGixIsTbGRHNrmw/5c292f95-929d-48f3-9432-0f00a8c77934.png?version=7pTy7xkAeI5qrU9scI3nWmKb7CzBMlfU\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"7pTy7xkAeI5qrU9scI3nWmKb7CzBMlfU\"\r\n    }\r\n  }\r\n}",
+    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\",\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\",\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\": {\r\n      \"name\": \"purple monster\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/spritelab/CdlNOvtih6CV7QUekCCPH7e11tMwCGQh/category_characters/purple_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 2,\r\n      \"version\": null\r\n    },\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\": {\r\n      \"name\": \"purple monster_copy_2\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/level_animations/ovRL7kY4h0T5ruFtW0DGsfMXI2Tk5TQ3/green_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"oycOMmpMYUlbuvr1vxX5HsKyTRXYAebW\"\r\n    },\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\": {\r\n      \"name\": \"purple monster_copy_1\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/level_animations/Ym.dMUlPsvTGiw.0LDrfOA7voAZgXdMl/magenta_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"7pTy7xkAeI5qrU9scI3nWmKb7CzBMlfU\"\r\n    }\r\n  }\r\n}",
     "soft_buttons": [
       "leftButton",
       "rightButton",

diff --git a/dashboard/config/scripts/levels/CodeBreak E05 Beg Practice.level b/dashboard/config/scripts/levels/CodeBreak E05 Beg Practice.level
@@ -53,7 +53,7 @@
     "block_pools": [
       "GamelabJr"
     ],
-    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\",\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\",\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\": {\r\n      \"name\": \"purple monster\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/spritelab/CdlNOvtih6CV7QUekCCPH7e11tMwCGQh/category_characters/purple_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 2,\r\n      \"version\": null\r\n    },\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\": {\r\n      \"name\": \"purple monster_copy_2\",\r\n      \"sourceUrl\": \"https://levelbuilder-studio.code.org/v3/animations/VMkrxJPPGixIsTbGRHNrmw/dd16fbf1-c73f-4b26-aafb-be2810a01d5c.png?version=oycOMmpMYUlbuvr1vxX5HsKyTRXYAebW\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"oycOMmpMYUlbuvr1vxX5HsKyTRXYAebW\"\r\n    },\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\": {\r\n      \"name\": \"purple monster_copy_1\",\r\n      \"sourceUrl\": \"https://levelbuilder-studio.code.org/v3/animations/VMkrxJPPGixIsTbGRHNrmw/5c292f95-929d-48f3-9432-0f00a8c77934.png?version=7pTy7xkAeI5qrU9scI3nWmKb7CzBMlfU\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"7pTy7xkAeI5qrU9scI3nWmKb7CzBMlfU\"\r\n    }\r\n  }\r\n}",
+    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\",\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\",\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\": {\r\n      \"name\": \"purple monster\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/spritelab/CdlNOvtih6CV7QUekCCPH7e11tMwCGQh/category_characters/purple_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 2,\r\n      \"version\": null\r\n    },\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\": {\r\n      \"name\": \"purple monster_copy_2\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/level_animations/ovRL7kY4h0T5ruFtW0DGsfMXI2Tk5TQ3/green_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"oycOMmpMYUlbuvr1vxX5HsKyTRXYAebW\"\r\n    },\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\": {\r\n      \"name\": \"purple monster_copy_1\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/level_animations/Ym.dMUlPsvTGiw.0LDrfOA7voAZgXdMl/magenta_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"7pTy7xkAeI5qrU9scI3nWmKb7CzBMlfU\"\r\n    }\r\n  }\r\n}",
     "soft_buttons": [
       "leftButton",
       "rightButton",

diff --git a/dashboard/config/scripts/levels/CodeBreak E05 Int Challenge1.level b/dashboard/config/scripts/levels/CodeBreak E05 Int Challenge1.level
@@ -53,7 +53,7 @@
     "block_pools": [
       "GamelabJr"
     ],
-    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\",\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\",\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\": {\r\n      \"name\": \"purple monster\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/spritelab/CdlNOvtih6CV7QUekCCPH7e11tMwCGQh/category_characters/purple_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 2,\r\n      \"version\": null\r\n    },\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\": {\r\n      \"name\": \"purple monster_copy_2\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/jV2PabG3pTYNEzPP0TT2nQUBZkh1W4aNmvq8mVG2XOo/dd16fbf1-c73f-4b26-aafb-be2810a01d5c.png?version=OZDJA1obJD6zNMz3trGz3JINv_FoidNI\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"OZDJA1obJD6zNMz3trGz3JINv_FoidNI\"\r\n    },\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\": {\r\n      \"name\": \"purple monster_copy_1\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/jV2PabG3pTYNEzPP0TT2nQUBZkh1W4aNmvq8mVG2XOo/5c292f95-929d-48f3-9432-0f00a8c77934.png?version=tTxLU3rNlmpr4ItpnO66sYUwOAsqDy73\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"tTxLU3rNlmpr4ItpnO66sYUwOAsqDy73\"\r\n    }\r\n  }\r\n}",
+    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\",\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\",\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"4b62a499-b010-4f3b-984c-91bbb0a9e393\": {\r\n      \"name\": \"purple monster\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/spritelab/CdlNOvtih6CV7QUekCCPH7e11tMwCGQh/category_characters/purple_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 2,\r\n      \"version\": null\r\n    },\r\n    \"dd16fbf1-c73f-4b26-aafb-be2810a01d5c\": {\r\n      \"name\": \"purple monster_copy_2\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/level_animations/vd4vLDvezkF4ZAWjcRkBrQv1KkqPBIxj/blue_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"OZDJA1obJD6zNMz3trGz3JINv_FoidNI\"\r\n    },\r\n    \"5c292f95-929d-48f3-9432-0f00a8c77934\": {\r\n      \"name\": \"purple monster_copy_1\",\r\n      \"sourceUrl\": \"https://studio.code.org/api/v1/animation-library/level_animations/W9Xm7dcEDipC4JKXTtxhJ5JhaAqnU21B/pink_monster.png\",\r\n      \"frameSize\": {\r\n        \"x\": 280,\r\n        \"y\": 290\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"tTxLU3rNlmpr4ItpnO66sYUwOAsqDy73\"\r\n    }\r\n  }\r\n}",
     "soft_buttons": [
       "leftButton",
       "rightButton",

diff --git a/dashboard/config/scripts/levels/CodeBreak E08 Beg Challenge 2.level b/dashboard/config/scripts/levels/CodeBreak E08 Beg Challenge 2.level
diff --git a/dashboard/config/scripts/levels/CodeBreak E08 Beg Challenge1.level b/dashboard/config/scripts/levels/CodeBreak E08 Beg Challenge1.level
diff --git a/dashboard/config/scripts/levels/CodeBreak E11 Beg Challeng.level b/dashboard/config/scripts/levels/CodeBreak E11 Beg Challeng.level