Merge pull request #1120 from transloadit/url-plugin-test-fix

test url-plugin

.travis.yml

@@ -18,6 +18,8 @@ cache:
 services:
 - docker
 addons:
+  hosts:
+    - companion.test
   apt:
     sources:
     - ubuntu-toolchain-r-test
@@ -28,6 +30,7 @@ addons:
       secure: nAMJ/d1fm9urTYsQ+1uqj6Jjf71J8rzwYBSZbTDAeUEZzAdvGc0a9H3PYWM4pnUDPo5s1c9MMetXi2XNdUbXgMKHbEnePZ2mJamqFtXMmpG8pgFmMqj+btMd7Yybt070tRsn4Vy0uBSi2H/en7F3j+grABJV+SAXqWkSB7CU1fZaN/u0DpoGBNj1ZNwkYCIhpLueYJTPRWBOodMAarXuFv5+7KFOKuZM3tF/JjsMNSSaDgTkz13BZnbX6vNPxGJJNJcyJGSaXrVW8hh1Zmvnk/XdiLy+vt7Wz1wz3A9ebiFDuydo5AAkxrLFsCJ5nGEqLg3bkr6NaTRpbM84ZT3i1FQMTdKP6OHHqwAeBscB6BkyhZhzvsFtl2YRBNK9mA3OtOYvBmTkFkNqvrPQlfu7cFtyG5+AUfSCiTTgS/vWIwoqSVAXaOEqN8Fp54ecUdkzCTttl3gXteZzNLRYvyQcFpoJb6E+dS8qAW0OFOteiwKVuPCh3nGUzBP13bRo1i9UAX7ZCTlpjinkxE8ryzbToo6ZcVQMBAkKhaw/x8GzOtfm5rgYMeQzGEoBJNfr7qqfs7JMxAIEMYjrTL9PXVOp/R8F3FdsqbV70jSyfsxMSMkwSWFRmVslG8+Djy8P3LnckGy1FEbMHnH8GZHZg+hbBzN8Be1/1fV0oRRAr939WRc=
     access_key:
       secure: OY3oWwiJghfty9wSPVvlhirvFGxPHDdIRuVkzAv6j7C/hj2BWYAP/UHrwdQ9XiYisHi/B5mGeyRVlrAf0MNGrG84rTDUbTWZbmktfuxl7A+Y6c0czk+s4SdhOiANG5b3tFl5wKq8h7uhrWH5/jWoKQ2Fz1VDCqxTvvZQbo41jSBhi7TBia626hxEePzdaiuw6HhGFZtfaoVs/FX30ylz8WDNrBjwCynjxsT52BaQrVvgEhuyzlOpI69YkZBPOq4fc3KiZ2YR43gLTx8K+sYCE9yJxdg1xT/UAawEhmedU83nyBZVo4rr7+03AixIxtI28MUCfBMlcsGwBxcKEKY/IWcp9UkPCq6+zALQoncV478tP21eYvlmxSFhYCrv+WEQlN+BcNjr4OJlmmFDbCVaF7r9qLeQPImU0+9iJU3OjrW7lpfLxORpGDEr2Nx6awKkIJCxNyK9weefeNo6Fz3V1kkyZ/7yWFeniJnRUCbahrB2XgzxIE+W307s1Qs4fm6JK7hVLTtG4fBzjChmAyGIzu744ws9WqmjvkC9D7OfnuXqanv/VcBFqPiudInerv7NL8FketUC+fxe/7XJfcxdaDGBjk8Kq7zXDohGRGymUXEoMDNJsKkMMlaKzdf7tgqdhsRJoH9NCVqrDXuG5al0UtrDP5RS7qfoxUunJmNFhlg=
+    no_ssl_bump_domains: companion.test
 env:
   global:
   - CXX=g++-4.8

test/endtoend/providers/test.js → test/endtoend/providers/disabled.test.js

@@ -1,4 +1,14 @@
 /* global browser, expect  */
+
+/*
+  WARNING! PLEASE READ THIS BEFORE ENABLING THIS TEST ON TRAVIS.
+
+  Before enabling this test on travis, please keep in mind that with this "no_ssl_bump_domains" option set
+  here https://github.com/transloadit/uppy/blob/998c7b1805acb8d305a562dd9726ebae98575e07/.travis.yml#L33
+  SSL encryption may not be enabled between the running companion and the testing browser client.
+
+  Hence, provider tokens (Google, Instagram, Dropbox) may be at risk of getting hijacked.
+*/
 const testURL = 'http://localhost:4567/providers'
 
 describe('File upload with Providers', () => {

test/endtoend/url-plugin/main.js

@@ -5,13 +5,20 @@ const Dashboard = require('@uppy/dashboard')
 const Url = require('@uppy/url')
 const Tus = require('@uppy/tus')
 
-Uppy({
-  id: 'uppyProvider',
-  debug: true
-})
-  .use(Dashboard, {
-    target: '#uppyDashboard',
-    inline: true
+function initUrlPlugin (companionUrl) {
+  Uppy({
+    id: 'uppyProvider',
+    debug: true
   })
-  .use(Url, { target: Dashboard, serverUrl: 'http://localhost:3020' })
-  .use(Tus, { endpoint: 'https://master.tus.io/files/' })
+    .use(Dashboard, {
+      target: '#uppyDashboard',
+      inline: true
+    })
+    .use(Url, {
+      target: Dashboard,
+      serverUrl: companionUrl
+    })
+    .use(Tus, { endpoint: 'https://master.tus.io/files/' })
+}
+
+window.initUrlPlugin = initUrlPlugin

test/endtoend/url-plugin/disabled.test.js → test/endtoend/url-plugin/test.js

@@ -1,12 +1,14 @@
 /* global browser, expect  */
-const testURL = 'http://localhost:4567/url-plugin'
-
 describe('File upload with URL plugin', () => {
-  beforeEach(() => {
-    browser.url(testURL)
-  })
-
   it('should import  and upload a file completely with Url Plugin', () => {
+    browser.url('http://localhost:4567/url-plugin')
+
+    const isOnTravis = !!(process.env.TRAVIS && process.env.CI)
+    const companionUrl = isOnTravis ? 'http://companion.test:3030' : 'http://localhost:3030'
+    browser.execute(function (companionUrl) {
+      window.initUrlPlugin(companionUrl)
+    }, companionUrl)
+
     // select url plugin
     browser.click(`.uppy-DashboardTab-btn[aria-controls=uppy-DashboardContent-panel--Url]`)
     // import set url value

test/endtoend/utils.js

@@ -59,9 +59,9 @@ class CompanionService {
       stdio: 'pipe',
       env: Object.assign({}, process.env, {
         COMPANION_DATADIR: path.join(__dirname, '../../output'),
-        COMPANION_DOMAIN: 'localhost:3020',
+        COMPANION_DOMAIN: 'localhost:3030',
         COMPANION_PROTOCOL: 'http',
-        COMPANION_PORT: 3020,
+        COMPANION_PORT: 3030,
         COMPANION_SECRET: process.env.TEST_COMPANION_SECRET,
         COMPANION_DROPBOX_KEY: process.env.TEST_COMPANION_DROPBOX_KEY,
         COMPANION_DROPBOX_SECRET: process.env.TEST_COMPANION_DROPBOX_SECRET,

test/endtoend/wdio.base.conf.js

@@ -110,7 +110,7 @@ exports.config = {
   // See the full list at http://mochajs.org/
   mochaOpts: {
     ui: 'dot',
-    timeout: 30000
+    timeout: 50000
   },
 
   /**