From 7fc84f3cc087deab5d937ee589de56fa40cd7ced Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Thu, 28 Mar 2019 14:13:11 -0230
Subject: ci: Add build:test Gulp task for e2e build

---
 .circleci/config.yml |  8 ++++----
 gulpfile.js          | 14 ++++++++++++++
 package.json         |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 807ed042c..686a996c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,11 +23,9 @@ workflows:
       - test-e2e-chrome:
           requires:
             - prep-deps-npm
-            - prep-build
       - test-e2e-firefox:
           requires:
             - prep-deps-npm
-            - prep-build
       # - test-e2e-beta-drizzle:
       #     requires:
       #       - prep-deps-npm
@@ -191,7 +189,8 @@ jobs:
           at: .
       - run:
           name: test:e2e:chrome
-          command: npm run test:e2e:chrome
+          command: npm run build:test && npm run test:e2e:chrome
+          no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
@@ -208,7 +207,8 @@ jobs:
           at: .
       - run:
           name: test:e2e:firefox
-          command: npm run test:e2e:firefox
+          command: npm run build:test && npm run test:e2e:chrome
+          no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
diff --git a/gulpfile.js b/gulpfile.js
index 57d20c54a..caddb620a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -313,6 +313,7 @@ createTasksForBuildJsUIDeps({ dependenciesToBundle: uiDependenciesToBundle, file
 createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'dev:extension:js', devMode: true })
 createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'dev:test-extension:js', devMode: true, testing: 'true' })
 createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:extension:js' })
+createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:test:extension:js', testing: 'true' })
 
 function createTasksForBuildJsUIDeps ({ dependenciesToBundle, filename }) {
   const destinations = browserPlatforms.map(platform => `./dist/${platform}`)
@@ -445,6 +446,19 @@ gulp.task('build',
   )
 )
 
+gulp.task('build:test',
+  gulp.series(
+    'clean',
+    'build:scss',
+    gulpParallel(
+      'build:extension:js:uideps',
+      'build:test:extension:js',
+      'copy'
+    ),
+    'manifest:testing'
+  )
+)
+
 gulp.task('build:extension',
   gulp.series(
     'clean',
diff --git a/package.json b/package.json
index 79451612c..41d914c09 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "doc": "jsdoc -c development/tools/.jsdoc.json",
     "publish-docs": "gh-pages -d docs/jsdocs",
     "start:test": "gulp dev:test",
+    "build:test": "gulp build:test",
     "test": "npm run test:unit && npm run test:integration && 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\"",
-- 
cgit