diff options
| -rw-r--r-- | app/models/referential.rb | 12 | ||||
| -rw-r--r-- | spec/controllers/routes_controller_spec.rb | 4 | ||||
| -rw-r--r-- | spec/requests/referentials_spec.rb | 8 |
3 files changed, 13 insertions, 11 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb index ab02930fc..88e472ca7 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -22,11 +22,13 @@ class Referential < ActiveRecord::Base has_many :exports, :dependent => :destroy def slug_excluded_values - if slug.start_with? "pg_" - errors.add(:slug,"pg_excluded") - end - if slug == 'public' - errors.add(:slug,"public_excluded") + if ! slug.nil? + if slug.start_with? "pg_" + errors.add(:slug,"pg_excluded") + end + if slug == 'public' + errors.add(:slug,"public_excluded") + end end end diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb index e0485b77d..4fc1dcc28 100644 --- a/spec/controllers/routes_controller_spec.rb +++ b/spec/controllers/routes_controller_spec.rb @@ -72,8 +72,8 @@ describe RoutesController do assigns[:map].route.should == route end - it "assigns route.stop_points.paginate(:page => nil, :per_page => 10) as @stop_points" do - assigns[:stop_points].should == route.stop_points.paginate(:page => nil, :per_page => 10) + it "assigns route.stop_points.paginate(:page => nil) as @stop_points" do + assigns[:stop_points].should == route.stop_points.paginate(:page => nil) end end diff --git a/spec/requests/referentials_spec.rb b/spec/requests/referentials_spec.rb index 9204c76e9..094add627 100644 --- a/spec/requests/referentials_spec.rb +++ b/spec/requests/referentials_spec.rb @@ -8,7 +8,7 @@ describe "Referentials" do it "should support no referential" do visit referentials_path - page.should have_content("Espace de données") + page.should have_content("Espace de Données") end context "when several referentials exist" do @@ -33,9 +33,9 @@ describe "Referentials" do visit new_referential_path fill_in "Nom", :with => "Test" fill_in "Code", :with => "test" - fill_in "Point haut/droite emprise par défaut", :with => "0.0, 0.0" - fill_in "Point bas/gauche emprise par défaut", :with => "1.0, 1.0" - click_button "Créer Espace de données" + fill_in "Point haut/droite de l'emprise par défaut", :with => "0.0, 0.0" + fill_in "Point bas/gauche de l'emprise par défaut", :with => "1.0, 1.0" + click_button "Créer Espace de Données" Referential.where(:name => "Test").should_not be_nil # CREATE SCHEMA |