diff --git a/Gemfile b/Gemfile index af535d444..de63a0f1f 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +gem 'turbolinks', '~> 2.5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index fd3ccac28..372420e1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -539,9 +539,8 @@ GEM tilt (2.0.5) timecop (0.8.1) trollop (2.1.2) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.0) + turbolinks (2.5.3) + coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (3.0.3) @@ -651,7 +650,7 @@ DEPENDENCIES spring-commands-rspec therubyracer timecop - turbolinks + turbolinks (~> 2.5) uglifier (>= 1.3.0) unicorn vcr diff --git a/public/fonts/bootstrap/glyphicons-halflings-regular.woff b/public/fonts/bootstrap/glyphicons-halflings-regular.woff new file mode 100644 index 000000000..9e612858f Binary files /dev/null and b/public/fonts/bootstrap/glyphicons-halflings-regular.woff differ diff --git a/spec/features/backoffice/connection_spec.rb b/spec/features/backoffice/connection_spec.rb index 20dab8f8b..ee9acfa42 100644 --- a/spec/features/backoffice/connection_spec.rb +++ b/spec/features/backoffice/connection_spec.rb @@ -16,7 +16,7 @@ feature 'when gestionnaire come to /backoffice and is not authenticated' do page.click_on 'Se connecter' end scenario 'he stay on the same page with an error' do - expect(page).to have_content('email ou mot de passe incorrect.') + expect(page).to have_content('Email ou mot de passe incorrect.') end end context 'when user enter good credentials' do diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb index db62fda24..6b7434208 100644 --- a/spec/models/procedure_spec.rb +++ b/spec/models/procedure_spec.rb @@ -17,7 +17,6 @@ describe Procedure do it { is_expected.to have_db_column(:description) } it { is_expected.to have_db_column(:organisation) } it { is_expected.to have_db_column(:direction) } - it { is_expected.to have_db_column(:test) } it { is_expected.to have_db_column(:euro_flag) } it { is_expected.to have_db_column(:logo) } it { is_expected.to have_db_column(:logo_secure_token) }