diff options
Diffstat (limited to 'spec/javascript')
20 files changed, 21 insertions, 54 deletions
diff --git a/spec/javascript/journey_patterns/actions_spec.js b/spec/javascript/journey_patterns/actions_spec.js index 75f2682b1..2542fa2f4 100644 --- a/spec/javascript/journey_patterns/actions_spec.js +++ b/spec/javascript/journey_patterns/actions_spec.js @@ -1,4 +1,4 @@ -import actions from '../../app/javascript/journey_patterns/actions' +import actions from '../../../app/javascript/journey_patterns/actions' const dispatch = function(){} const currentPage = 1 diff --git a/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js b/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js index 13a88e477..24780ab5a 100644 --- a/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js +++ b/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js @@ -1,4 +1,4 @@ -import jpReducer from '../../../app/javascript/journey_patterns/reducers/journeyPatterns' +import jpReducer from '../../../../app/javascript/journey_patterns/reducers/journeyPatterns' let state = [] let fakeStopPoints = [{ diff --git a/spec/javascript/journey_patterns/reducers/modal_spec.js b/spec/javascript/journey_patterns/reducers/modal_spec.js index a5d215a9c..4031ea234 100644 --- a/spec/javascript/journey_patterns/reducers/modal_spec.js +++ b/spec/javascript/journey_patterns/reducers/modal_spec.js @@ -1,4 +1,4 @@ -import modalReducer from '../../../app/javascript/journey_patterns/reducers/modal' +import modalReducer from '../../../../app/javascript/journey_patterns/reducers/modal' let state = {} diff --git a/spec/javascript/journey_patterns/reducers/pagination_spec.js b/spec/javascript/journey_patterns/reducers/pagination_spec.js index 78a09eace..a3cd4bf0a 100644 --- a/spec/javascript/journey_patterns/reducers/pagination_spec.js +++ b/spec/javascript/journey_patterns/reducers/pagination_spec.js @@ -1,4 +1,4 @@ -import reducer from '../../../app/javascript/journey_patterns/reducers/pagination' +import reducer from '../../../../app/javascript/journey_patterns/reducers/pagination' const diff = 1 let state = { diff --git a/spec/javascript/journey_patterns/reducers/status_spec.js b/spec/javascript/journey_patterns/reducers/status_spec.js index bf27a3d05..ab094088a 100644 --- a/spec/javascript/journey_patterns/reducers/status_spec.js +++ b/spec/javascript/journey_patterns/reducers/status_spec.js @@ -1,4 +1,4 @@ -import statusReducer from '../../../app/javascript/journey_patterns/reducers/status' +import statusReducer from '../../../../app/javascript/journey_patterns/reducers/status' let state = {} diff --git a/spec/javascript/routes/actions_spec.js b/spec/javascript/routes/actions_spec.js index 490b1b615..507e1e0ed 100644 --- a/spec/javascript/routes/actions_spec.js +++ b/spec/javascript/routes/actions_spec.js @@ -1,4 +1,4 @@ -import actions from '../../app/javascript/routes/actions' +import actions from '../../../app/javascript/routes/actions' describe('actions', () => { it('should create an action to add a stop', () => { diff --git a/spec/javascript/routes/reducers/stop_points_spec.js b/spec/javascript/routes/reducers/stop_points_spec.js index c9d76a29e..b375cdc2c 100644 --- a/spec/javascript/routes/reducers/stop_points_spec.js +++ b/spec/javascript/routes/reducers/stop_points_spec.js @@ -1,4 +1,4 @@ -import stopPointsReducer from '../../../app/javascript/routes/reducers/stopPoints' +import stopPointsReducer from '../../../../app/javascript/routes/reducers/stopPoints' let state = [] diff --git a/spec/javascript/spec_helper.js b/spec/javascript/spec_helper.js deleted file mode 100644 index b6fcb7d8d..000000000 --- a/spec/javascript/spec_helper.js +++ /dev/null @@ -1,35 +0,0 @@ -// Teaspoon includes some support files, but you can use anything from your own support path too. -// require support/jasmine-jquery-1.7.0 -// require support/jasmine-jquery-2.0.0 -// require support/jasmine-jquery-2.1.0 -// require support/sinon -// require support/your-support-file -//= require jquery -//= require bootstrap-sass-official -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. -//= require support/phantomjs-shims -// -// You can require your own javascript files here. By default this will include everything in application, however you -// may get better load performance if you require the specific files that are being used in the spec that tests them. -//= require application -// -// Deferring execution -// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call -// Teaspoon.execute() after everything has been loaded. Simple example of a timeout: -// -// Teaspoon.defer = true -// setTimeout(Teaspoon.execute, 1000) -// -// Matching files -// By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your -// spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the -// configuration in teaspoon_env.rb -// -// Manifest -// If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in -// the configuration and use this file as a manifest. -// -// For more information: http://github.com/modeset/teaspoon diff --git a/spec/javascript/time_table/actions_spec.js b/spec/javascript/time_table/actions_spec.js index 4c1d4e200..9c1a6b6f1 100644 --- a/spec/javascript/time_table/actions_spec.js +++ b/spec/javascript/time_table/actions_spec.js @@ -1,4 +1,4 @@ -import actions from '../../app/javascript/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/javascript/time_table/reducers/metas_spec.js b/spec/javascript/time_table/reducers/metas_spec.js index 8806cc1cf..374ad1814 100644 --- a/spec/javascript/time_table/reducers/metas_spec.js +++ b/spec/javascript/time_table/reducers/metas_spec.js @@ -1,4 +1,4 @@ -import metasReducer from '../../../app/javascript/time_tables/reducers/metas' +import metasReducer from '../../../../app/javascript/time_tables/reducers/metas' let state = {} diff --git a/spec/javascript/time_table/reducers/modal_spec.js b/spec/javascript/time_table/reducers/modal_spec.js index f627ca53b..1794d2acd 100644 --- a/spec/javascript/time_table/reducers/modal_spec.js +++ b/spec/javascript/time_table/reducers/modal_spec.js @@ -1,4 +1,4 @@ -import modalReducer from '../../../app/javascript/time_tables/reducers/modal' +import modalReducer from '../../../../app/javascript/time_tables/reducers/modal' let state = {} diff --git a/spec/javascript/time_table/reducers/pagination_spec.js b/spec/javascript/time_table/reducers/pagination_spec.js index 23135d98b..5aa8d27a2 100644 --- a/spec/javascript/time_table/reducers/pagination_spec.js +++ b/spec/javascript/time_table/reducers/pagination_spec.js @@ -1,4 +1,4 @@ -import paginationReducer from '../../../app/javascript/time_tables/reducers/pagination' +import paginationReducer from '../../../../app/javascript/time_tables/reducers/pagination' const dispatch = function(){} diff --git a/spec/javascript/time_table/reducers/status_spec.js b/spec/javascript/time_table/reducers/status_spec.js index 15b733703..63e4033f9 100644 --- a/spec/javascript/time_table/reducers/status_spec.js +++ b/spec/javascript/time_table/reducers/status_spec.js @@ -1,4 +1,4 @@ -import statusReducer from '../../../app/javascript/time_tables/reducers/status' +import statusReducer from '../../../../app/javascript/time_tables/reducers/status' let state = {} diff --git a/spec/javascript/time_table/reducers/timetable_spec.js b/spec/javascript/time_table/reducers/timetable_spec.js index f5e5c0a36..f0f9eaa8c 100644 --- a/spec/javascript/time_table/reducers/timetable_spec.js +++ b/spec/javascript/time_table/reducers/timetable_spec.js @@ -1,5 +1,5 @@ require('whatwg-fetch') -import timetableReducer from '../../../app/javascript/time_tables/reducers/timetable' +import timetableReducer from '../../../../app/javascript/time_tables/reducers/timetable' let state = {} const dispatch = function(){} @@ -22,6 +22,8 @@ let json = { time_table_dates: time_table_dates } + + describe('timetable reducer with empty state', () => { beforeEach(() => { state = { diff --git a/spec/javascript/vehicle_journeys/actions_spec.js b/spec/javascript/vehicle_journeys/actions_spec.js index b847893d2..74765a7ef 100644 --- a/spec/javascript/vehicle_journeys/actions_spec.js +++ b/spec/javascript/vehicle_journeys/actions_spec.js @@ -1,4 +1,4 @@ -import actions from 'vehicle_journeys/actions/index' +import actions from '../../../app/javascript/vehicle_journeys/actions/index' const dispatch = function(){} const currentPage = 1 diff --git a/spec/javascript/vehicle_journeys/reducers/filters_spec.js b/spec/javascript/vehicle_journeys/reducers/filters_spec.js index 43f03ab30..207eaead4 100644 --- a/spec/javascript/vehicle_journeys/reducers/filters_spec.js +++ b/spec/javascript/vehicle_journeys/reducers/filters_spec.js @@ -1,4 +1,4 @@ -import statusReducer from '../../../app/javascript/vehicle_journeys/reducers/filters' +import statusReducer from '../../../../app/javascript/vehicle_journeys/reducers/filters' let state = {} diff --git a/spec/javascript/vehicle_journeys/reducers/modal_spec.js b/spec/javascript/vehicle_journeys/reducers/modal_spec.js index 210ac9e78..69de9168b 100644 --- a/spec/javascript/vehicle_journeys/reducers/modal_spec.js +++ b/spec/javascript/vehicle_journeys/reducers/modal_spec.js @@ -1,4 +1,4 @@ -import modalReducer from '../../app/javascript/vehicle_journeys/reducers/modal' +import modalReducer from '../../../../app/javascript/vehicle_journeys/reducers/modal' let state = {} diff --git a/spec/javascript/vehicle_journeys/reducers/pagination_spec.js b/spec/javascript/vehicle_journeys/reducers/pagination_spec.js index 0ec2dbea2..352997c7c 100644 --- a/spec/javascript/vehicle_journeys/reducers/pagination_spec.js +++ b/spec/javascript/vehicle_journeys/reducers/pagination_spec.js @@ -1,4 +1,4 @@ -import reducer from '../../../app/javascript/vehicle_journeys/reducers/pagination' +import reducer from '../../../../app/javascript/vehicle_journeys/reducers/pagination' const diff = 1 let state = { diff --git a/spec/javascript/vehicle_journeys/reducers/status_spec.js b/spec/javascript/vehicle_journeys/reducers/status_spec.js index 7dee88c97..8fc0f557e 100644 --- a/spec/javascript/vehicle_journeys/reducers/status_spec.js +++ b/spec/javascript/vehicle_journeys/reducers/status_spec.js @@ -1,4 +1,4 @@ -import statusReducer from '../../../app/javascript/vehicle_journeys/reducers/status' +import statusReducer from '../../../../app/javascript/vehicle_journeys/reducers/status' let state = {} diff --git a/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js index 92f75206c..c02ab3398 100644 --- a/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js +++ b/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js @@ -1,4 +1,4 @@ -import vjReducer from '../../../app/javascript/vehicle_journeys/reducers/vehicleJourneys' +import vjReducer from '../../../../app/javascript/vehicle_journeys/reducers/vehicleJourneys' let state = [] let stateModal = { |