test - remove flat integration tests

.circleci/config.yml

@@ -11,9 +11,6 @@ workflows:
       - prep-docs:
           requires:
             - prep-deps-npm
-      - prep-scss:
-          requires:
-            - prep-deps-npm
       - test-lint:
           requires:
             - prep-deps-npm
@@ -39,14 +36,6 @@ workflows:
           requires:
             - prep-deps-npm
             - prep-build
-      - test-integration-flat-chrome:
-          requires:
-            - prep-deps-npm
-            - prep-scss
-      - test-integration-flat-firefox:
-          requires:
-            - prep-deps-npm
-            - prep-scss
       - all-tests-pass:
           requires:
             - test-lint
@@ -55,8 +44,6 @@ workflows:
             - test-e2e-chrome
             - test-e2e-firefox
             # - test-e2e-beta-drizzle
-            - test-integration-flat-chrome
-            - test-integration-flat-firefox
       - job-screens:
           requires:
             - prep-deps-npm
@@ -135,25 +122,6 @@ jobs:
           paths:
             - docs/jsdocs
 
-  prep-scss:
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Get Scss Cache key
-          # this allows us to checksum against a whole directory
-          command: find ui/app/css -type f -exec md5sum {} \; | sort -k 2 > scss_checksum
-      - run:
-          name: Build for integration tests
-          command: npm run test:integration:build
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ui/app/css/output
-
   test-lint:
     docker:
       - image: circleci/node:8.11.3-browsers
@@ -293,33 +261,6 @@ jobs:
           name: test:mozilla-lint
           command: npm run mozilla-lint
 
-  test-integration-flat-firefox:
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Install Firefox
-          command: ./.circleci/scripts/firefox-install
-      - run:
-          name: test:integration:flat
-          command: npm run test:flat
-
-  test-integration-flat-chrome:
-    environment:
-      browsers: '["Chrome"]'
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: test:integration:flat
-          command: npm run test:flat
-
   all-tests-pass:
     docker:
       - image: circleci/node:8.11.3-browsers

.eslintignore

@@ -13,7 +13,3 @@ app/scripts/chromereload.js
 app/vendor/**
 
 ui/lib/blockies.js
-
-test/integration/bundle.js
-test/integration/jquery-3.1.0.min.js
-test/integration/helpers.js

.gitignore

@@ -30,7 +30,6 @@ docs/jsdocs
 
 development/bundle.js
 development/states.js
-test/integration/bundle.js
 test/background.js
 test/bundle.js
 test/test-bundle.js

README.md

@@ -57,10 +57,6 @@ npm start
 npm run dist
 ```
 
-#### Writing Browser Tests
-
-To write tests that will be run in the browser using QUnit, add your test files to `test/integration/lib`.
-
 ## Other Docs
 
 - [How to add custom build to Chrome](./docs/add-to-chrome.md)

package.json

@@ -7,25 +7,17 @@
     "dist": "gulp dist",
     "doc": "jsdoc -c development/tools/.jsdoc.json",
     "publish-docs": "gh-pages -d docs/jsdocs",
-    "test": "npm run test:unit && npm run test:integration && npm run lint",
+    "test": "npm run test:unit && npm run test:e2e:chrome && npm run lint",
     "watch:test:unit": "nodemon --exec \"npm run test:unit\" ./test ./app ./ui",
     "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"",
     "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js",
-    "test:integration": "npm run test:integration:build && npm run test:flat",
-    "test:integration:build": "gulp build:scss",
     "test:e2e:drizzle:beta": "SELENIUM_BROWSER=chrome test/e2e/beta/run-drizzle.sh",
     "test:e2e:chrome": "SELENIUM_BROWSER=chrome test/e2e/beta/run-all.sh",
     "test:e2e:firefox": "SELENIUM_BROWSER=firefox test/e2e/beta/run-all.sh",
     "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'",
     "test:screens:run": "node test/screens/new-ui.js",
     "test:coverage": "nyc --reporter=text --reporter=html npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
-    "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
-    "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests && npm run test:flat:build:locales",
-    "test:flat:build:tests": "node test/integration/index.js",
-    "test:flat:build:states": "node development/genStates.js",
-    "test:flat:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
-    "test:flat:build:ui": "npm run test:flat:build:states && browserify ./development/mock-dev.js -o ./development/bundle.js",
     "ganache:start": "ganache-cli --noVMErrorsOnRPCResponse -i 5777 -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
     "sentry:publish": "node ./development/sentry-publish.js",
     "lint": "eslint .",

test/base.conf.js

@@ -19,7 +19,6 @@ module.exports = function (config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'test/integration/jquery-3.1.0.min.js',
       { pattern: 'dist/chrome/images/**/*.*', watched: false, included: false, served: true },
       { pattern: 'dist/chrome/fonts/**/*.*', watched: false, included: false, served: true },
       { pattern: 'dist/chrome/_locales/**/*.*', watched: false, included: false, served: true },