Disable integration tests

.travis.yml

@@ -27,22 +27,22 @@ jobs:
       before_script: yarn lint
       script: yarn test
 
-    - &integration-test
-      stage: "Integration against Catalog API versions :earth_asia:"
-      env: CATALOG_API_VERSION=pinned BROWSER=chrome
-      before_script: test/integration/build.sh $CATALOG_API_VERSION
-      script: test/integration/run.sh $BROWSER
-      after_failure:
-        - docker ps
-        - docker logs test_test-app_1
-        - sleep 10 # Give the docker logs a chance to output
+    # - &integration-test
+    #   stage: "Integration against Catalog API versions :earth_asia:"
+    #   env: CATALOG_API_VERSION=pinned BROWSER=chrome
+    #   before_script: test/integration/build.sh $CATALOG_API_VERSION
+    #   script: test/integration/run.sh $BROWSER
+    #   after_failure:
+    #     - docker ps
+    #     - docker logs test_test-app_1
+    #     - sleep 10 # Give the docker logs a chance to output
 
-    - <<: *integration-test
-      env: CATALOG_API_VERSION=pinned BROWSER=edge
-    - <<: *integration-test
-      env: CATALOG_API_VERSION=latest BROWSER=chrome
-    - <<: *integration-test
-      env: CATALOG_API_VERSION=latest BROWSER=edge
+    # - <<: *integration-test
+    #   env: CATALOG_API_VERSION=pinned BROWSER=edge
+    # - <<: *integration-test
+    #   env: CATALOG_API_VERSION=latest BROWSER=chrome
+    # - <<: *integration-test
+    #   env: CATALOG_API_VERSION=latest BROWSER=edge
 
     - stage: "Deploy :rocket:"
       script: "REACT_APP_OAM_ENV=staging yarn build"
@@ -73,17 +73,19 @@ jobs:
           acl: public_read
           on:
             repo: hotosm/oam-browser
-            branch: develop
+            branch: master
 
-  allow_failures:
-    # TODO: Edge just has a problem with entering text into the
-    # autocomplete.
-    - <<: *integration-test
-      env: CATALOG_API_VERSION=pinned BROWSER=edge
-    # Latest (bleeding edge) is always allowed to fail. It's just here to give
-    # developers forewarning about any upstream breaking change they
-    # might introduce.
-    - <<: *integration-test
-      env: CATALOG_API_VERSION=latest BROWSER=chrome
-    - <<: *integration-test
-      env: CATALOG_API_VERSION=latest BROWSER=edge
+  # allow_failures:
+  #   # TODO: Edge just has a problem with entering text into the
+  #   # autocomplete.
+  #   - <<: *integration-test
+  #     env: CATALOG_API_VERSION=pinned BROWSER=edge
+  #   - <<: *integration-test
+  #     env: CATALOG_API_VERSION=pinned BROWSER=chrome
+  #   # Latest (bleeding edge) is always allowed to fail. It's just here to give
+  #   # developers forewarning about any upstream breaking change they
+  #   # might introduce.
+  #   - <<: *integration-test
+  #     env: CATALOG_API_VERSION=latest BROWSER=chrome
+  #   - <<: *integration-test
+  #     env: CATALOG_API_VERSION=latest BROWSER=edge

yarn.lock

@@ -3842,6 +3842,16 @@ history@^2.1.2:
     query-string "^3.0.0"
     warning "^2.0.0"
 
+history@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c"
+  integrity sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=
+  dependencies:
+    invariant "^2.2.1"
+    loose-envify "^1.2.0"
+    query-string "^4.2.2"
+    warning "^3.0.0"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -6090,6 +6100,14 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+piwik-react-router@^0.12.1:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/piwik-react-router/-/piwik-react-router-0.12.1.tgz#0caf984715a5b22c85610e0c02ae372b1ca37c41"
+  integrity sha512-Ebi7rBKV/S+YJ3UF/6t6n/wRx1/4yilR1caG/JhdefkYHh8gopqy2kxjaaD++LS9tTmtPNfokEHWbXTbw2W7OA==
+  dependencies:
+    url-join "^1.1.0"
+    warning "^3.0.0"
+
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -6531,9 +6549,10 @@ query-string@^3.0.0:
   dependencies:
     strict-uri-encode "^1.0.0"
 
-query-string@^4.1.0:
+query-string@^4.1.0, query-string@^4.2.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
@@ -8125,6 +8144,11 @@ urix@^0.1.0, urix@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
+url-join@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
+  integrity sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=
+
 [email protected]:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"