Fix spec and update devise usage

4 files changed, 17 insertions, 14 deletions

diff --git a/spec/features/companies_spec.rb b/spec/features/companies_spec.rb
index e5c7ae6e5..3628d04f0 100644
--- a/spec/features/companies_spec.rb
+++ b/spec/features/companies_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 describe "Companies", :type => :feature do
   login_user
 
-  let!(:companies) { Array.new(2) { create :company } }
+  let!(:companies) { Array.new(2) { create :company } }  
   subject { companies.first }
 
   describe "list" do
diff --git a/spec/features/referentials_spec.rb b/spec/features/referentials_spec.rb
index d4a21479f..65225d28d 100644
--- a/spec/features/referentials_spec.rb
+++ b/spec/features/referentials_spec.rb
@@ -51,7 +51,6 @@ describe "Referentials", :type => :feature do
     let(:referential) {  create(:referential, :organisation => @user.organisation) } 
 
     it "should remove referential" do
-      pending "Unauthorized DELETE (ticket #14)"
       visit referential_path(referential)
       click_link "Supprimer"
       expect(Referential.where(:slug => referential.slug)).to be_blank
diff --git a/spec/features/routes_spec.rb b/spec/features/routes_spec.rb
index da4120309..0c98f8725 100644
--- a/spec/features/routes_spec.rb
+++ b/spec/features/routes_spec.rb
@@ -10,51 +10,55 @@ describe "Routes", :type => :feature do
 
   describe "from lines page to a line page" do
     it "display line's routes" do
-      pending
       visit referential_lines_path(referential)
       click_link "#{line.name}"
       expect(page).to have_content(route.name)
       expect(page).to have_content(route2.name)
     end
   end
+  
   describe "from line's page to route's page" do
     it "display route properties" do
-      pending
       visit referential_line_path(referential,line)
       click_link "#{route.name}"
       expect(page).to have_content(route.name)
       expect(page).to have_content(route.number)
     end
   end
+  
   describe "from line's page, create a new route" do      
     it "return to line's page that display new route" do
-      pending
       visit referential_line_path(referential,line)
       click_link "Ajouter une séquence d'arrêts"
-      fill_in "Nom", :with => "A to B"
+      save_and_open_page
+      fill_in "route_name", :with => "A to B"
       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")
       expect(page).to have_content("A to B")
     end
   end
+  
   describe "from line's page, select a route and edit it" do      
     it "return to line's page with changed name" do
-      pending
       visit referential_line_path(referential,line)
       click_link "#{route.name}"
       click_link "Modifier cette séquence d'arrêts"
-      fill_in "Nom", :with => "#{route.name}-changed"
+      save_and_open_page
+      fill_in "route_name", :with => "#{route.name}-changed"
+      save_and_open_page
       click_button("Modifier Séquence d'arrêts")
       expect(page).to have_content("#{route.name}-changed")
     end
   end
+  
   describe "from line's page, select a route and delete it" do      
     it "return to line's page without route name" do
-      pending
       visit referential_line_path(referential,line)
       click_link "#{route.name}"
-      #click_link "Supprimer cette séquence d'arrêts"
-      #page.should_not have_content(route.name)
+      click_link "Supprimer cette séquence d'arrêts"
+      expect(page).not_to have_content(route.name)
     end
   end
 end
diff --git a/spec/features/stop_areas_spec.rb b/spec/features/stop_areas_spec.rb
index 4d1b7e2bb..ff5a73438 100644
--- a/spec/features/stop_areas_spec.rb
+++ b/spec/features/stop_areas_spec.rb
@@ -25,7 +25,7 @@ describe "StopAreas", :type => :feature do
     it "display map" do
       visit referential_stop_areas_path(referential)
       click_link "#{stop_areas.first.name}"
-      expect(page).to have_selector("#map", :class => 'stop_area')
+      expect(page).to have_selector("#map.stop_area")
     end
     
   end
@@ -34,7 +34,7 @@ describe "StopAreas", :type => :feature do
     it "creates stop_area and return to show" do
       visit referential_stop_areas_path(referential)
       click_link "Ajouter un arrêt"
-      fill_in "Nom", :with => "StopArea 1"
+      fill_in "stop_area_name", :with => "StopArea 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:StopArea:1"        
       click_button("Créer arrêt")
@@ -46,7 +46,7 @@ describe "StopAreas", :type => :feature do
     it "edit stop_area" do
       visit referential_stop_area_path(referential, subject)
       click_link "Modifier cet arrêt"
-      fill_in "Nom", :with => "StopArea Modified"
+      fill_in "stop_area_name", :with => "StopArea Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier arrêt")
       expect(page).to have_content("StopArea Modified")