diff options
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/index.js | 14 | ||||
| -rw-r--r-- | config/locales/time_tables.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/time_tables.fr.yml | 3 | ||||
| -rw-r--r-- | spec/models/referential_cloning_spec.rb | 10 |
4 files changed, 19 insertions, 9 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js index 489446ab9..2a76ae43a 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js @@ -8,10 +8,10 @@ var actions = require("./actions") var enableBatching = require('./batch').enableBatching // logger, DO NOT REMOVE -var applyMiddleware = require('redux').applyMiddleware -var createLogger = require('redux-logger') -var thunkMiddleware = require('redux-thunk').default -var promise = require('redux-promise') +// var applyMiddleware = require('redux').applyMiddleware +// var createLogger = require('redux-logger') +// var thunkMiddleware = require('redux-thunk').default +// var promise = require('redux-promise') var selectedJP = [] @@ -85,12 +85,12 @@ if (window.jpOrigin){ initialState.filters.queryString = actions.encodeParams(params) } -const loggerMiddleware = createLogger() +// const loggerMiddleware = createLogger() let store = createStore( enableBatching(vehicleJourneysApp), - initialState, - applyMiddleware(thunkMiddleware, promise, loggerMiddleware) + initialState + // applyMiddleware(thunkMiddleware, promise, loggerMiddleware) ) render( diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml index 6c5aac012..dc6c6d9f4 100644 --- a/config/locales/time_tables.en.yml +++ b/config/locales/time_tables.en.yml @@ -87,6 +87,7 @@ en: calendars: "Calendar view" calendar_details: "Calendar details" calendar: "Calendar" + calendar_id: "Calendar" dates: "Peculiar dates" date: "On" excluded_dates: "Excluded dates" diff --git a/config/locales/time_tables.fr.yml b/config/locales/time_tables.fr.yml index 36a588eb4..886aaa263 100644 --- a/config/locales/time_tables.fr.yml +++ b/config/locales/time_tables.fr.yml @@ -68,7 +68,7 @@ fr: other: "calendriers" attributes: time_table: - comment: "Nom" + comment: "Nom du calendrier" color: "Couleur associée" bounding_dates: 'Période contenue dans le calendrier' version: "Abréviation" @@ -89,6 +89,7 @@ fr: calendars: "Calendrier" calendar_details: "Données du calendrier" calendar: Modèle de calendrier + calendar_id: Modèle de calendrier dates: "Dates particulières" date: "Le" excluded_dates: "Dates exclues" diff --git a/spec/models/referential_cloning_spec.rb b/spec/models/referential_cloning_spec.rb index 30391b53e..5acd433ec 100644 --- a/spec/models/referential_cloning_spec.rb +++ b/spec/models/referential_cloning_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' RSpec.describe ReferentialCloning, :type => :model do it 'should have a valid factory' do @@ -7,4 +7,12 @@ RSpec.describe ReferentialCloning, :type => :model do it { should belong_to :source_referential } it { should belong_to :target_referential } + + describe "ReferentialCloningWorker" do + let(:referential_cloning) { FactoryGirl.create(:referential_cloning) } + + it "should schedule a job in worker" do + expect{referential_cloning.run_callbacks(:commit)}.to change {ReferentialCloningWorker.jobs.count}.by(1) + end + end end |