Merge with V2_5 development

4 files changed, 6 insertions, 6 deletions

diff --git a/spec/features/journey_pattern_spec.rb b/spec/features/journey_pattern_spec.rb
index 1e50b47c7..9bddcf3bc 100644
--- a/spec/features/journey_pattern_spec.rb
+++ b/spec/features/journey_pattern_spec.rb
@@ -33,7 +33,7 @@ describe "JourneyPatterns", :type => :feature do
       click_link "Ajouter une mission"
       fill_in "Nom", :with => "A to B"
       fill_in "Comment", :with => "AB"
-      click_button("Créer Mission")
+      click_button("Créer mission")
       expect(page).to have_content("A to B")
     end
   end
diff --git a/spec/features/routes_spec.rb b/spec/features/routes_spec.rb
index 669d99ff2..538c6a969 100644
--- a/spec/features/routes_spec.rb
+++ b/spec/features/routes_spec.rb
@@ -34,7 +34,7 @@ describe "Routes", :type => :feature do
       fill_in "Indice", :with => "AB"
       select 'aller', :from => "route_direction_code"
       select 'aller', :from => "route_wayback_code" 
-      click_button("Créer Séquence d'arrêts")
+      click_button("Créer séquence d'arrêts")
       expect(page).to have_content("A to B")
     end
   end
@@ -45,7 +45,7 @@ describe "Routes", :type => :feature do
       click_link "#{route.name}"
       click_link "Modifier cette séquence d'arrêts"
       fill_in "route_name", :with => "#{route.name}-changed"
-      click_button("Modifier Séquence d'arrêts")
+      click_button("Modifier séquence d'arrêts")
       expect(page).to have_content("#{route.name}-changed")
     end
   end
diff --git a/spec/features/time_tables_spec.rb b/spec/features/time_tables_spec.rb
index d9304c5ba..9b99ad8a3 100644
--- a/spec/features/time_tables_spec.rb
+++ b/spec/features/time_tables_spec.rb
@@ -31,7 +31,7 @@ describe "TimeTables", :type => :feature do
       click_link "Ajouter un calendrier"
       fill_in "Nom", :with => "TimeTable 1"
       fill_in "Identifiant Neptune", :with => "test:Timetable:1"
-      click_button("Créer Calendrier")
+      click_button("Créer calendrier")
       expect(page).to have_content("TimeTable 1")
     end
   end
@@ -41,7 +41,7 @@ describe "TimeTables", :type => :feature do
       visit referential_time_table_path(referential, subject)
       click_link "Modifier ce calendrier"
       fill_in "Nom", :with => "TimeTable Modified"
-      click_button("Modifier Calendrier")
+      click_button("Modifier calendrier")
       expect(page).to have_content("TimeTable Modified")
     end
   end
diff --git a/spec/features/users/user_show_spec.rb b/spec/features/users/user_show_spec.rb
index fdc48a279..a4db51497 100644
--- a/spec/features/users/user_show_spec.rb
+++ b/spec/features/users/user_show_spec.rb
@@ -38,7 +38,7 @@ feature 'User profile page', :devise do
     login_as(me, :scope => :user)
     Capybara.current_session.driver.header 'Referer', authenticated_root_path
     visit organisation_user_path(other)
-    expect(page).to have_content 'Access denied.'
+    expect(page).to have_content other.email
   end
 
 end