Merge branch 'master' into gql/editor-updates

.travis.yml

@@ -1,4 +1,4 @@
-# == INSTRUCTIONS FOR SETTING UP TRAVIS (and GitHub Pages) ==
+# == INSTRUCTIONS FOR SETTING UP TRAVIS ==
 #
 # 1. Find this repository in your Travis-CI dashboard.
 #    open settings and add an environment variable called
@@ -8,12 +8,10 @@
 #    **DO NOT TURN ON 'Display value in build log'!!!!**
 #
 # 2. Push the code to the repository.
-# 3. Set the GitHub Pages source in the GitHub repository settings to the
-#    gh-pages branch.
 
 language: node_js
 node_js:
-  - "12"
+  - lts/*
 
 os: linux
 
@@ -22,35 +20,20 @@ addons:
     packages:
       - libgconf-2-4 # cypress binary dependency
 
-env:
+cache: npm
-  - DEPLOY_ENV=POSTWOMAN_IO
-
-cache:
-  npm: true
-  directories:
-    - "node_modules"
-    - ~/.cache
 
 branches:
   only:
-    - "master"
+    - master
 
 install:
-  - "npm install firebase-tools"
+  - npm ci
-  - "npm install"
 
 before_script:
-  - "npm run build" # use nuxt build and start to run tests
+  - npm run build # use nuxt build and start to run tests
-  - "npm run test"
 
 script:
-  - "cd functions"
+  - npm test
-  - "npm install"
-  - "cd .."
-  - "npm run generate"
 
 notifications:
   webhooks: https://www.travisbuddy.com
-
-after_success:
-  - firebase deploy --token $FIREBASE_TOKEN

tests/e2e/integration/proxy.spec.js

@@ -4,6 +4,7 @@ describe("Proxy disabled - local request", () => {
       .get("#url")
       .then(el => expect(el.val() === "https://api.thecatapi.com").to.equal(true))
       .get("#response-details-wrapper")
+      .should("be.visible")
       .should($wrapper => {
         expect($wrapper).to.contain("FAKE Cat API")
       })
@@ -15,9 +16,10 @@ describe("Proxy enabled - external request", () => {
     cy.enableProxy("/?url=https://api.thecatapi.com&path=")
       .get("#send")
       .click()
-      .get("#response-details-wrapper")
+      .get("#response-details-wrapper", { timeout: 24000 })
+      .should("be.visible")
       .should($wrapper => {
-        expect($wrapper).to.contain("Cat API")
+        expect($wrapper).to.contain("The Cat API")
       })
   })
 })