24 files changed, 34 insertions, 33 deletions
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 81ffcd55c..ae1deb610 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -11,8 +11,7 @@ let pathsToClean = [
 let cleanOptions = {
   root: __dirname + '/../../',
   verbose: true,
-  dry: false,
-  watch: true
+  dry: false
 };
 
 
@@ -21,14 +20,6 @@ environment.plugins.set(
   new CleanWebpackPlugin(pathsToClean, cleanOptions)
 )
 
-environment.plugins.set(
-  'UglifyJs',
-  new webpack.optimize.UglifyJsPlugin({
-    compress: {
-      warnings: false
-    }
-  })
-)
 // environment.plugins.set('Provide', new webpack.ProvidePlugin({
 //     $: 'jquery',
 //     jQuery: 'jquery',
diff --git a/config/webpack/production.js b/config/webpack/production.js
index b66885a3c..97b6a77ff 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,3 +1,12 @@
 const environment = require('./environment')
 
+environment.plugins.set(
+  'UglifyJs',
+  new webpack.optimize.UglifyJsPlugin({
+    compress: {
+      warnings: false
+    }
+  })
+)
+
 module.exports = environment.toWebpackConfig()
 \ No newline at end of file
diff --git a/spec/javascripts/journey_patterns/actions_spec.js b/spec/javascript/journey_patterns/actions_spec.js
index 07f83ca1b..75f2682b1 100644
--- a/spec/javascripts/journey_patterns/actions_spec.js
+++ b/spec/javascript/journey_patterns/actions_spec.js
@@ -1,4 +1,4 @@
-var actions = require('es6_browserified/journey_patterns/actions')
+import actions from '../../app/javascript/journey_patterns/actions'
 
 const dispatch = function(){}
 const currentPage = 1
diff --git a/spec/javascripts/journey_patterns/reducers/journey_patterns_spec.js b/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js
index df288e530..13a88e477 100644
--- a/spec/javascripts/journey_patterns/reducers/journey_patterns_spec.js
+++ b/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js
@@ -1,4 +1,5 @@
-var jpReducer = require('es6_browserified/journey_patterns/reducers/journeyPatterns')
+import jpReducer from '../../../app/javascript/journey_patterns/reducers/journeyPatterns'
+
 let state = []
 let fakeStopPoints = [{
   area_type : "lda",
diff --git a/spec/javascripts/journey_patterns/reducers/modal_spec.js b/spec/javascript/journey_patterns/reducers/modal_spec.js
index 0bc7c9240..a5d215a9c 100644
--- a/spec/javascripts/journey_patterns/reducers/modal_spec.js
+++ b/spec/javascript/journey_patterns/reducers/modal_spec.js
@@ -1,4 +1,4 @@
-var modalReducer = require('es6_browserified/journey_patterns/reducers/modal')
+import modalReducer from '../../../app/javascript/journey_patterns/reducers/modal'
 
 let state = {}
 
diff --git a/spec/javascripts/journey_patterns/reducers/pagination_spec.js b/spec/javascript/journey_patterns/reducers/pagination_spec.js
index d0f9fef47..78a09eace 100644
--- a/spec/javascripts/journey_patterns/reducers/pagination_spec.js
+++ b/spec/javascript/journey_patterns/reducers/pagination_spec.js
@@ -1,4 +1,4 @@
-var reducer = require('es6_browserified/journey_patterns/reducers/pagination')
+import reducer from '../../../app/javascript/journey_patterns/reducers/pagination'
 
 const diff = 1
 let state = {
diff --git a/spec/javascripts/journey_patterns/reducers/status_spec.js b/spec/javascript/journey_patterns/reducers/status_spec.js
index 91cbbb0b8..bf27a3d05 100644
--- a/spec/javascripts/journey_patterns/reducers/status_spec.js
+++ b/spec/javascript/journey_patterns/reducers/status_spec.js
@@ -1,4 +1,4 @@
-var statusReducer = require('es6_browserified/journey_patterns/reducers/status')
+import statusReducer from '../../../app/javascript/journey_patterns/reducers/status'
 
 let state = {}
 
diff --git a/spec/javascripts/itineraries/actions_spec.js b/spec/javascript/routes/actions_spec.js
index 2bae59987..490b1b615 100644
--- a/spec/javascripts/itineraries/actions_spec.js
+++ b/spec/javascript/routes/actions_spec.js
@@ -1,4 +1,4 @@
-var actions = require('es6_browserified/itineraries/actions')
+import actions from '../../app/javascript/routes/actions'
 
 describe('actions', () => {
   it('should create an action to add a stop', () => {
diff --git a/spec/javascripts/itineraries/reducers/stop_points_spec.js b/spec/javascript/routes/reducers/stop_points_spec.js
index 0331a424c..c9d76a29e 100644
--- a/spec/javascripts/itineraries/reducers/stop_points_spec.js
+++ b/spec/javascript/routes/reducers/stop_points_spec.js
@@ -1,4 +1,4 @@
-var stopPointsReducer = require('es6_browserified/itineraries/reducers/stopPoints')
+import stopPointsReducer from '../../../app/javascript/routes/reducers/stopPoints'
 
 let state = []
 
diff --git a/spec/javascripts/spec_helper.coffee b/spec/javascript/spec_helper.coffee
index 9ff516885..9ff516885 100644
--- a/spec/javascripts/spec_helper.coffee
+++ b/spec/javascript/spec_helper.coffee
diff --git a/spec/javascripts/spec_helper.js b/spec/javascript/spec_helper.js
index a0285cccf..b6fcb7d8d 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascript/spec_helper.js
@@ -6,7 +6,7 @@
 // require support/your-support-file
 //= require jquery
 //= require bootstrap-sass-official
-require('es6-object-assign').polyfill();
+import { polyfill } from 'es6-object-assign'
 //
 // PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
 // Use this polyfill to avoid the confusion.
diff --git a/spec/javascripts/time_table/actions_spec.js b/spec/javascript/time_table/actions_spec.js
index a7344586d..4c1d4e200 100644
--- a/spec/javascripts/time_table/actions_spec.js
+++ b/spec/javascript/time_table/actions_spec.js
@@ -1,4 +1,4 @@
-var actions = require('es6_browserified/time_tables/actions')
+import actions from '../../app/javascript/time_tables/actions'
 const dispatch = function(){}
 const dayTypes = [true, true, true, true, true, true, true]
 const day = {
diff --git a/spec/javascripts/time_table/reducers/metas_spec.js b/spec/javascript/time_table/reducers/metas_spec.js
index 5ec7a0034..8806cc1cf 100644
--- a/spec/javascripts/time_table/reducers/metas_spec.js
+++ b/spec/javascript/time_table/reducers/metas_spec.js
@@ -1,4 +1,4 @@
-var metasReducer = require('es6_browserified/time_tables/reducers/metas')
+import metasReducer from '../../../app/javascript/time_tables/reducers/metas'
 
 let state = {}
 
diff --git a/spec/javascripts/time_table/reducers/modal_spec.js b/spec/javascript/time_table/reducers/modal_spec.js
index 05d58a138..f627ca53b 100644
--- a/spec/javascripts/time_table/reducers/modal_spec.js
+++ b/spec/javascript/time_table/reducers/modal_spec.js
@@ -1,4 +1,4 @@
-var modalReducer = require('es6_browserified/time_tables/reducers/modal')
+import modalReducer from '../../../app/javascript/time_tables/reducers/modal'
 
 let state = {}
 
diff --git a/spec/javascripts/time_table/reducers/pagination_spec.js b/spec/javascript/time_table/reducers/pagination_spec.js
index 3c1edb9c5..23135d98b 100644
--- a/spec/javascripts/time_table/reducers/pagination_spec.js
+++ b/spec/javascript/time_table/reducers/pagination_spec.js
@@ -1,4 +1,4 @@
-var paginationReducer = require('es6_browserified/time_tables/reducers/pagination')
+import paginationReducer from '../../../app/javascript/time_tables/reducers/pagination'
 
 const dispatch = function(){}
 
diff --git a/spec/javascripts/time_table/reducers/status_spec.js b/spec/javascript/time_table/reducers/status_spec.js
index f000324cc..15b733703 100644
--- a/spec/javascripts/time_table/reducers/status_spec.js
+++ b/spec/javascript/time_table/reducers/status_spec.js
@@ -1,4 +1,4 @@
-var statusReducer = require('es6_browserified/time_tables/reducers/status')
+import statusReducer from '../../../app/javascript/time_tables/reducers/status'
 
 let state = {}
 
diff --git a/spec/javascripts/time_table/reducers/timetable_spec.js b/spec/javascript/time_table/reducers/timetable_spec.js
index 21f6d236d..f5e5c0a36 100644
--- a/spec/javascripts/time_table/reducers/timetable_spec.js
+++ b/spec/javascript/time_table/reducers/timetable_spec.js
@@ -1,5 +1,5 @@
 require('whatwg-fetch')
-var timetableReducer = require('es6_browserified/time_tables/reducers/timetable')
+import timetableReducer from '../../../app/javascript/time_tables/reducers/timetable'
 
 let state = {}
 const dispatch = function(){}
diff --git a/spec/javascripts/vehicle_journeys/actions_spec.js b/spec/javascript/vehicle_journeys/actions_spec.js
index 707ae22cb..b847893d2 100644
--- a/spec/javascripts/vehicle_journeys/actions_spec.js
+++ b/spec/javascript/vehicle_journeys/actions_spec.js
@@ -1,4 +1,4 @@
-var actions = require('es6_browserified/vehicle_journeys/actions')
+import actions from 'vehicle_journeys/actions/index'
 
 const dispatch = function(){}
 const currentPage = 1
diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascript/vehicle_journeys/reducers/filters_spec.js
index 0a6729c8b..43f03ab30 100644
--- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/filters_spec.js
@@ -1,4 +1,4 @@
-var statusReducer = require('es6_browserified/vehicle_journeys/reducers/filters')
+import statusReducer from '../../../app/javascript/vehicle_journeys/reducers/filters'
 
 let state = {}
 
diff --git a/spec/javascripts/vehicle_journeys/reducers/modal_spec.js b/spec/javascript/vehicle_journeys/reducers/modal_spec.js
index 4530b5ee7..210ac9e78 100644
--- a/spec/javascripts/vehicle_journeys/reducers/modal_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/modal_spec.js
@@ -1,4 +1,4 @@
-var modalReducer = require('es6_browserified/vehicle_journeys/reducers/modal')
+import modalReducer from '../../app/javascript/vehicle_journeys/reducers/modal'
 
 let state = {}
 
diff --git a/spec/javascripts/vehicle_journeys/reducers/pagination_spec.js b/spec/javascript/vehicle_journeys/reducers/pagination_spec.js
index 57417a3b9..0ec2dbea2 100644
--- a/spec/javascripts/vehicle_journeys/reducers/pagination_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/pagination_spec.js
@@ -1,4 +1,4 @@
-var reducer = require('es6_browserified/vehicle_journeys/reducers/pagination')
+import reducer from '../../../app/javascript/vehicle_journeys/reducers/pagination'
 
 const diff = 1
 let state = {
diff --git a/spec/javascripts/vehicle_journeys/reducers/status_spec.js b/spec/javascript/vehicle_journeys/reducers/status_spec.js
index d48d48f4a..7dee88c97 100644
--- a/spec/javascripts/vehicle_journeys/reducers/status_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/status_spec.js
@@ -1,4 +1,4 @@
-var statusReducer = require('es6_browserified/vehicle_journeys/reducers/status')
+import statusReducer from '../../../app/javascript/vehicle_journeys/reducers/status'
 
 let state = {}
 
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 3b2137a2a..92f75206c 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -1,4 +1,4 @@
-var vjReducer = require('es6_browserified/vehicle_journeys/reducers/vehicleJourneys')
+import vjReducer from '../../../app/javascript/vehicle_journeys/reducers/vehicleJourneys'
 
 let state = []
 let stateModal = {
diff --git a/spec/teaspoon_env.rb b/spec/teaspoon_env.rb
index d9dd2cc47..da6697b28 100644
--- a/spec/teaspoon_env.rb
+++ b/spec/teaspoon_env.rb
@@ -10,11 +10,11 @@ Teaspoon.configure do |config|
 
   # Paths that will be appended to the Rails assets paths
   # Note: Relative to `config.root`.
-  config.asset_paths = ["spec/javascripts", "spec/javascripts/stylesheets"]
+  config.asset_paths = ["spec/javascript", "spec/javascript/stylesheets"]
 
   # Fixtures are rendered through a controller, which allows using HAML, RABL/JBuilder, etc. Files in these paths will
   # be rendered as fixtures.
-  config.fixture_paths = ["spec/javascripts/fixtures"]
+  config.fixture_paths = ["spec/javascript/fixtures"]
 
   # SUITES
   #
@@ -38,7 +38,7 @@ Teaspoon.configure do |config|
 
     # Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These
     # files need to be within an asset path. You can add asset paths using the `config.asset_paths`.
-    suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
+    suite.matcher = "{spec/javascript,app/javascript}/**/*_spec.{js,js.coffee,coffee}"
 
     # Load additional JS files, but requiring them in your spec helper is the preferred way to do this.
     #suite.javascripts = []