Merge pull request #974 from transloadit/fix/react-map-set

React integration test fixes

test/endtoend/create-react-app/package-lock.json

@@ -2954,6 +2954,11 @@
         "event-emitter": "~0.3.5"
       }
     },
+    "es6-shim": {
+      "version": "0.35.3",
+      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.3.tgz",
+      "integrity": "sha1-m/tzY/7//4emzbbNk+QF7DxLbyY="
+    },
     "es6-symbol": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",

test/endtoend/create-react-app/package.json

@@ -4,6 +4,7 @@
   "private": true,
   "homepage": "/create-react-app/",
   "dependencies": {
+    "es6-shim": "^0.35.3",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-scripts": "1.1.4"

test/endtoend/create-react-app/src/index.js

@@ -1,3 +1,4 @@
+import 'es6-shim' // Polyfill Map and Set for React
 import React from 'react'
 import ReactDOM from 'react-dom'
 import App from './App'

test/endtoend/create-react-app/_test.js → test/endtoend/create-react-app/test.js

@@ -10,8 +10,8 @@ describe('webpack build', () => {
     const el = $('#inline-dashboard .uppy-Dashboard-inner')
     el.waitForExist()
     const bgColor = el.getCssProperty('background-color').value
-    // computed value is rgb(), not hex (but using a regex here to show the expected value too)
-    expect(/^rgb\(250, ?250, ?250\)$|^#fafafa$/.test(bgColor)).to.equal(true)
+    // computed value is rgb() or rgba(), not hex (but listing it here to show the expected value too)
+    expect(/^rgba?\(250, ?250, ?250(?:, ?1)?\)$|^#fafafa$/.test(bgColor)).to.equal(true)
   })
 })
 
@@ -34,20 +34,20 @@ describe('React: Dashboard', () => {
 
     // close
     browser.click('#inline-dashboard-toggle')
-    browser.pause(50)
+    browser.pause(250)
     // open
     browser.click('#inline-dashboard-toggle')
-    browser.pause(50)
+    browser.pause(250)
     // close
     browser.click('#inline-dashboard-toggle')
-    browser.pause(50)
+    browser.pause(250)
     // open
     browser.click('#inline-dashboard-toggle')
-    browser.pause(50)
+    browser.pause(250)
 
     // open GDrive panel
-    browser.click('.uppy-DashboardTab:nth-child(2)')
-    browser.pause(50)
+    browser.click('.uppy-DashboardTab:nth-child(2) button')
+    browser.pause(500)
 
     // side effecting property access, not a function!
     // eslint-disable-next-line no-unused-expressions
@@ -70,7 +70,8 @@ describe('React: DashboardModal', () => {
     modalToggle.click()
     browser.pause(50) // wait for the animation to start
 
-    expect(modalWrapper.getAttribute('aria-hidden')).to.equal(null)
+    // Edge appears to report empty string while others report null
+    expect(modalWrapper.getAttribute('aria-hidden')).to.be.oneOf([null, ''])
 
     browser.pause(500) // wait for the animation to complete