Refs #1995: update route#new & route#edit (fix tests)

4 files changed, 32 insertions, 27 deletions

diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 446eb5f70..d1e72de20 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -67,7 +67,6 @@ class Chouette::Route < Chouette::TridentActiveRecord
   # validates_presence_of :direction
   # validates_presence_of :wayback
 
-  validates :direction, inclusion: { in: self.direction.values }
   validates :wayback, inclusion: { in: self.wayback.values }
 
   before_destroy :dereference_opposite_route
diff --git a/app/views/referential_lines/_reflines_routes.html.slim b/app/views/referential_lines/_reflines_routes.html.slim
index de4f707c6..77b350fa6 100644
--- a/app/views/referential_lines/_reflines_routes.html.slim
+++ b/app/views/referential_lines/_reflines_routes.html.slim
@@ -1,5 +1,5 @@
 - if @routes.any?
-  h3 = t('.itineraries')
+  h3 = "Itinéraires"
 
   table.table.table-bordered.table-hover
     thead
@@ -9,25 +9,26 @@
         th.text-center = @routes.human_attribute_name(:wayback)
         th.text-center = @routes.human_attribute_name(:opposite_route)
         th.text-center = "Actions"
-          
-    - @routes.each do |route|
-      tr
-        td = truncate(route.name, length: 20)
-        td = route.published_name
-        td = route.wayback_text
-        td
-          - if route.opposite_route
-            = route.opposite_route.name
-          - else
-            = "Aucune séquence d'arrêts associée en sens opposé"
-          
-        td.text-center
-          .btn.btn-group.btn-group-sm
-            = link_to [@referential, @line, route], class: 'btn btn-default preview', title: "#{Chouette::Route.model_name.human.capitalize} #{route.name}" do
-              span.fa.fa-eye
+    
+    tbody
+      - @routes.each do |route|
+        tr
+          td = truncate(route.name, length: 20)
+          td = route.published_name
+          td = route.wayback_text
+          td
+            - if route.opposite_route
+              = route.opposite_route.name
+            - else
+              = "Aucune séquence d'arrêts associée en sens opposé"
             
-            = link_to edit_referential_line_route_path(@referential, @line, route), class: 'btn btn-default' do
-              span.fa.fa-pencil
+          td.text-center
+            .btn.btn-group.btn-group-sm
+              = link_to [@referential, @line, route], class: 'btn btn-default preview', title: "#{Chouette::Route.model_name.human.capitalize} #{route.name}" do
+                span.fa.fa-eye
+              
+              = link_to edit_referential_line_route_path(@referential, @line, route), class: 'btn btn-default' do
+                span.fa.fa-pencil
 
-            = link_to referential_line_route_path(@referential, @line, route), method: :delete, :data => {:confirm =>  t('routes.actions.destroy_confirm')}, class: 'btn btn-danger' do
-              span.fa.fa-trash-o
+              = link_to referential_line_route_path(@referential, @line, route), method: :delete, :data => {:confirm =>  t('routes.actions.destroy_confirm')}, class: 'btn btn-danger' do
+                span.fa.fa-trash-o
diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index 9073d59b6..b69b3faf2 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -1,3 +1,5 @@
+= params[:controller]
+
 = simple_form_for [@referential, @line, @route] do |f|
   .row
     .col-lg-6.col-md-6.col-sm-12.col-xs-12
@@ -8,9 +10,13 @@
   .row
     .col-lg-4.col-md-6.col-sm-8.col-xs-8
       = f.input :opposite_route, collection: @line.routes.select { |r| r.id != @route.id }
+    
+    / .col-lg-4.col-md-4.col-sm-4.col-xs-4
+    /   = f.input :direction, include_blank: false
+    
     .col-lg-4.col-md-4.col-sm-4.col-xs-4
       = f.input :wayback, include_blank: false
-
+    
   .row style="margin-top:20px"
     .col-lg-12.col-md-12.col-sm-12.col-xs-12
       #stop_points
diff --git a/spec/features/routes_spec.rb b/spec/features/routes_spec.rb
index e76665b31..267e2597b 100644
--- a/spec/features/routes_spec.rb
+++ b/spec/features/routes_spec.rb
@@ -31,12 +31,11 @@ describe "Routes", :type => :feature do
   describe "from line's page, create a new route" do
     it "return to line's page that display new route" do
       visit referential_line_path(referential,line)
-      click_link "Ajouter une séquence d'arrêts"
+      click_link "Ajouter un itinéraire"
       fill_in "route_name", :with => "A to B"
-      fill_in "Indice", :with => "AB"
-      select 'Aller', :from => "route_direction"
+      # select 'Aller', :from => "route_direction"
       select 'Aller', :from => "route_wayback"
-      click_button("Créer un(e) séquence d'arrêts")
+      click_button("Créer un itinéraire")
       expect(page).to have_content("A to B")
     end
   end