From 720650d2b0a978700edfd759c0928598f2b0ae0b Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 3 Nov 2016 19:11:38 -0500
Subject: [PATCH] precompile webpack assets when testing

---
 .gitlab-ci.yml                     | 5 +++++
 config/application.rb              | 1 +
 config/environments/development.rb | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0e780e1e6b..2ec9dfd2165 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,9 @@ before_script:
   - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS'
   - retry gem install knapsack
   - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql'
+  - curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
+  - apt-get install --assume-yes nodejs
+  - npm install
 
 stages:
 - prepare
@@ -61,6 +64,7 @@ stages:
   <<: *dedicated-runner
   <<: *use-db
   script:
+    - bundle exec rake webpack:compile
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
@@ -79,6 +83,7 @@ stages:
   <<: *dedicated-runner
   <<: *use-db
   script:
+    - bundle exec rake webpack:compile
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
diff --git a/config/application.rb b/config/application.rb
index 7607c7a61b2..4efe73c7798 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -84,6 +84,7 @@ module Gitlab
     config.webpack.config_file = "config/webpack.config.js"
     config.webpack.output_dir  = "public/assets/webpack"
     config.webpack.public_path = "assets/webpack"
+    config.webpack.dev_server.enabled = false
 
     # Enable the asset pipeline
     config.assets.enabled = true
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 45a8c1add3e..168c434f261 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -22,6 +22,9 @@ Rails.application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  # Enable webpack dev server
+  config.webpack.dev_server.enabled = true
+
   # Do not compress assets
   config.assets.compress = false