Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

Author: deploy-code-org

apps/package.json

@@ -227,6 +227,7 @@
     "react-dom-confetti": "^0.0.8",
     "react-hot-loader": "^1.3.1",
     "selectize": "^0.12.4",
+    "wgxpath": "^1.2.0",
     "whatwg-fetch": "^2.0.3"
   }
 }

apps/src/polyfills.js

@@ -2,6 +2,7 @@
  * "Pointer Events Polyfill" to support pointer events on Safari
  */
 import 'pepjs';
+import wickedGoodXpath from 'wgxpath';
 
 /**
  * A low-performance polyfill for toBlob based on toDataURL. Adapted from:
@@ -32,3 +33,10 @@ if (SVGElement.prototype.getElementsByClassName === undefined) {
         return this.querySelectorAll('.' + className);
     };
 }
+
+/**
+ * Polyfill for document.evaluate for IE
+ */
+if (!document.evaluate) {
+  wickedGoodXpath.install(window);
+}

apps/yarn.lock

@@ -12242,6 +12242,10 @@ websocket-extensions@>=0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
 
+wgxpath@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/wgxpath/-/wgxpath-1.2.0.tgz#a33e4e0f86e68e074d95d50a6e533d64938f432a"
+
 whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"

dashboard/test/ui/features/projects/public_project_gallery_project_validator.feature

@@ -72,5 +72,6 @@ Scenario: Can See App Lab/Game Lab View More Links
   Then I wait until element "#public-gallery" is visible
   Then I wait until element ".ui-project-app-type-area" is in the DOM
   And the project gallery contains 7 project types
+  And the project gallery contains 7 view more links
   And element ".ui-project-app-type-area:eq(4)" contains text "View more App Lab projects"
   And element ".ui-project-app-type-area:eq(5)" contains text "View more Game Lab projects"

dashboard/test/ui/features/projects/public_project_gallery_signed_out.feature

@@ -19,12 +19,7 @@ Scenario: Public Gallery Shows Expected Project Types
   And element ".ui-project-app-type-area:eq(5)" contains text "Game Lab"
   And element ".ui-project-app-type-area:eq(6)" contains text "Pre-reader"
 
-Scenario: View More Links Do NOT Show for App Lab and Game Lab
+Scenario: View More Links for App Lab and Game Lab Based on DCDO
   Then I wait until element ".ui-project-app-type-area" is in the DOM
   And the project gallery contains 7 project types
-  And the project gallery contains 5 view more links
-  And element ".ui-project-app-type-area:eq(0)" contains text "View more Play Lab projects"
-  And element ".ui-project-app-type-area:eq(4)" contains text "App Lab"
-  And element ".ui-project-app-type-area:eq(4)" does not contain text "View more"
-  And element ".ui-project-app-type-area:eq(5)" contains text "Game Lab"
-  And element ".ui-project-app-type-area:eq(5)" does not contain text "View more"
+  And I confirm correct visibility of view more links

dashboard/test/ui/features/spritelab/spritelab.feature

@@ -1,4 +1,3 @@
-@no_ie
 Feature: Sprite Lab
 
 Background:

dashboard/test/ui/features/step_definitions/projects.rb

@@ -1,3 +1,29 @@
+require 'dynamic_config/dcdo'
+
+# The "view more" links in the public project gallery for App Lab and Game Lab
+# are controlled by DCDO so we can quickly hide them if there are
+# inappropriate projects. This lets us test "view more" link
+# visibility without updating the tests every time we toggle the flag.
+And(/^I confirm correct visibility of view more links$/) do
+  dcdo_flag = DCDO.get('image_moderation', {})['limited_project_gallery']
+  hidden_view_more_links = dcdo_flag.nil? ? true : dcdo_flag
+  if hidden_view_more_links
+    steps %Q{
+      And the project gallery contains 5 view more links
+      And element ".ui-project-app-type-area:eq(4)" contains text "App Lab"
+      And element ".ui-project-app-type-area:eq(4)" does not contain text "View more"
+      And element ".ui-project-app-type-area:eq(5)" contains text "Game Lab"
+      And element ".ui-project-app-type-area:eq(5)" does not contain text "View more"
+    }
+  else
+    steps %Q{
+      And the project gallery contains 7 view more links
+      And element ".ui-project-app-type-area:eq(4)" contains text "View more App Lab projects"
+      And element ".ui-project-app-type-area:eq(5)" contains text "View more Game Lab projects"
+    }
+  end
+end
+
 And(/^I give user "([^"]*)" project validator permission$/) do |name|
   require_rails_env
   user = User.find_by_email_or_hashed_email(@users[name][:email])