diff options
| author | Luc Donnet | 2018-01-12 16:05:05 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-12 16:05:05 +0100 |
| commit | 18078e529cb406fe94817a43fc32f280ecbf30df (patch) | |
| tree | 5c1a72f3a3a87bcfea4ac272657a1a4d9252b550 | |
| parent | 907e0300cc2ff77df67171642c7cc5579a34163a (diff) | |
| parent | e6c189fd9a5895a751f05ff5a9fc867672bedf8b (diff) | |
| download | chouette-core-18078e529cb406fe94817a43fc32f280ecbf30df.tar.bz2 | |
Merge pull request #235 from af83/fix-timetables-specs
Fix Jest specs on timetables
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | spec/javascript/time_table/reducers/timetable_spec.js | 3 | ||||
| -rw-r--r-- | spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js | 1 | ||||
| -rw-r--r-- | yarn.lock | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/package.json b/package.json index 01625839c..80ca22f83 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "grunt-watch-change": "^0.1.1", "jest": "22.0.4", "jest-context": "^2.1.0", + "jest-environment-jsdom-global": "^1.0.2", "jest-set": "^2.0.0", "react-addons-test-utils": "15.6.2", "react-test-renderer": "^16.2.0", @@ -47,6 +48,7 @@ "roots": [ "<rootDir>/spec/javascript" ], + "testEnvironment": "jest-environment-jsdom-global", "setupFiles": [ "<rootDir>/spec/javascript/spec_helper.js", "jest-context/setup", diff --git a/spec/javascript/time_table/reducers/timetable_spec.js b/spec/javascript/time_table/reducers/timetable_spec.js index f0f9eaa8c..926fb2687 100644 --- a/spec/javascript/time_table/reducers/timetable_spec.js +++ b/spec/javascript/time_table/reducers/timetable_spec.js @@ -22,8 +22,6 @@ let json = { time_table_dates: time_table_dates } - - describe('timetable reducer with empty state', () => { beforeEach(() => { state = { @@ -87,6 +85,7 @@ describe('timetable reducer with filled state', () => { periode_range: periode_range, currentPage: current_periode_range } + jsdom.reconfigure({url: "http://example.com/foo/bar"}) expect( timetableReducer(state, { type: 'GO_TO_PREVIOUS_PAGE', diff --git a/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js b/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js index 786b74cc7..4f8d42d2d 100644 --- a/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js +++ b/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js @@ -2,7 +2,6 @@ import React, { Component } from 'react' import CustomFieldsInputs from '../../../../app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs' import renderer from 'react-test-renderer' require('select2') -console.log($().jquery) describe('CustomFieldsInputs', () => { set('values', () => { @@ -3462,6 +3462,10 @@ jest-docblock@^22.0.3: dependencies: detect-newline "^2.1.0" +jest-environment-jsdom-global@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom-global/-/jest-environment-jsdom-global-1.0.2.tgz#b3449e016e0b13cb0779704e29a1377f927b38a3" + jest-environment-jsdom@^22.0.5: version "22.0.5" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.0.5.tgz#7b479452e387aef5b4bf8b9fe03e8be77493f5ea" |