10 files changed, 44 insertions, 25 deletions
diff --git a/spec/factories/chouette_lines.rb b/spec/factories/chouette_lines.rb
index 5fff06778..2f5b1d2a5 100644
--- a/spec/factories/chouette_lines.rb
+++ b/spec/factories/chouette_lines.rb
@@ -1,6 +1,9 @@
 Factory.define :line, :class => "Chouette::Line" do |line|
   line.sequence(:name) { |n| "Line #{n}" }
-  line.sequence(:objectid) { |n| "Line:#{n}" }
+  line.sequence(:objectid) { |n| "test:Line:#{n}" }
+
   line.association :network, :factory => :network
   line.association :company, :factory => :company
+
+  line.sequence(:registration_number) { |n| "test-#{n}" }
 end
diff --git a/spec/factories/referential.rb b/spec/factories/referential.rb
index 4bdacb8c7..5c87a5427 100644
--- a/spec/factories/referential.rb
+++ b/spec/factories/referential.rb
@@ -1,4 +1,4 @@
-Factory.define :referential, :class => "Referential" do |f|
-  f.sequence(:name) { |n| "Referential #{n}" }
-  f.sequence(:slug) { |n| "referential_#{n}" }
-end
-\ No newline at end of file
+Factory.define :referential do |f|
+  f.sequence(:name) { |n| "Test #{n}" }
+  f.sequence(:slug) { |n| "test_#{n}" }
+end
diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb
new file mode 100644
index 000000000..f5f7286c3
--- /dev/null
+++ b/spec/models/chouette/line_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Chouette::Line do
+
+  subject { Factory :line }
+
+  it { should validate_presence_of :name }
+
+  it { should validate_presence_of :objectid }
+
+  it { should validate_numericality_of :version }
+
+  it { should validate_uniqueness_of :registrationnumber }
+
+end
diff --git a/spec/requests/companies_spec.rb b/spec/requests/companies_spec.rb
index b7a938977..be3f28c9d 100644
--- a/spec/requests/companies_spec.rb
+++ b/spec/requests/companies_spec.rb
@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe "Companies" do
-  let!(:referential) { Factory(:referential) }
-  let!(:companies) { Array.new(2) { Factory(:company) } }
+  let!(:referential) { Factory(:referential).switch }
+  let!(:companies) { referential; Array.new(2) { Factory(:company) } }
 
   describe "GET /companies" do
-    it "works! (now write some real specs)" do
-      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+    it "should display company names" do
       visit referential_companies_path(referential)
       page.should have_content(companies.first.name)
     end
diff --git a/spec/requests/lines_spec.rb b/spec/requests/lines_spec.rb
index 8633ee220..d5c9eea2f 100644
--- a/spec/requests/lines_spec.rb
+++ b/spec/requests/lines_spec.rb
@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe "Lines" do
-  let!(:referential) { Factory(:referential) }
-  let!(:lines) { Array.new(2) { Factory(:line) } }
+
+  let!(:referential) { Factory(:referential).switch }
+  let!(:lines) { referential; Array.new(2) { Factory(:line) } }
 
   describe "GET /lines" do
     it "works! (now write some real specs)" do
diff --git a/spec/requests/networks_spec.rb b/spec/requests/networks_spec.rb
index 17386b00a..b8b7fc8b4 100644
--- a/spec/requests/networks_spec.rb
+++ b/spec/requests/networks_spec.rb
@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe "Networks" do
-  let!(:referential) { Factory(:referential) }  
-  let!(:networks) { Array.new(2) { Factory(:network) } }
+  let!(:referential) { Factory(:referential).switch }  
+  let!(:networks) { referential; Array.new(2) { Factory(:network) } }
 
   describe "GET /networks" do
     it "works! (now write some real specs)" do
-      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
       visit referential_networks_path(referential)
       page.should have_content(networks.first.name)
     end
diff --git a/spec/requests/referentials_spec.rb b/spec/requests/referentials_spec.rb
index c3ed49234..4dc378780 100644
--- a/spec/requests/referentials_spec.rb
+++ b/spec/requests/referentials_spec.rb
@@ -29,13 +29,12 @@ describe "Referentials" do
   end
 
   describe "destroy" do
-    let(:referential) {  Factory(:referential, :slug => "Referential destroyed") } 
+    let(:referential) {  Factory(:referential) } 
 
     it "should" do
       visit referential_path(referential)
       click_link "Supprimer"
-      Referential.where(:slug => "Referential destroyed").should be_nil
-      # DELETE SCHEMA
+      Referential.where(:slug => referential.slug).should be_blank
     end
 
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1fd4d6894..d838f18e5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,6 +12,8 @@ require 'capybara/rails'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
+require 'will_paginate/array'
+
 RSpec.configure do |config|
   DatabaseCleaner.logger = Rails.logger
   # ## Mock Framework
@@ -45,6 +47,7 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
+    Apartment::Database.switch(nil)
     DatabaseCleaner.clean
   end
 
diff --git a/spec/views/lines/index.html.erb_spec.rb b/spec/views/lines/index.html.erb_spec.rb
index a290080eb..ddd7d9c76 100644
--- a/spec/views/lines/index.html.erb_spec.rb
+++ b/spec/views/lines/index.html.erb_spec.rb
@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe "/lines/index" do
 
-  let!(:referential) { assign( :referential, Factory(:referential) ) }
-  let!(:network) { Factory(:network) }
-  let!(:company) { Factory(:company) }
-  let!(:lines) { assign( :lines, Array.new(2) { Factory(:line, :network => network, :company => company) } )  }  
+  let!(:referential) { assign :referential, Factory(:referential) }
+  let!(:network) { Factory :network }
+  let!(:company) { Factory :company }
+  let!(:lines) { assign :lines, Array.new(2) { Factory(:line, :network => network, :company => company) }.paginate }  
+  let!(:q) { assign :q, Ransack::Search.new(Chouette::Line) }
 
   before :each do
-    rendered.stub(:collection).and_return( lines.order_by [[:number, :asc]] )    
-    view.stub(:link_to_order).and_return( "#" )
+    view.stub(:link_with_search).and_return("#")
   end
 
   it "should render a show link for each group" do        
diff --git a/spec/views/lines/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb
index 9d5b53cd3..edb7e8741 100644
--- a/spec/views/lines/show.html.erb_spec.rb
+++ b/spec/views/lines/show.html.erb_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "/lines/show" do
   
-  let!(:referential) { assign(:referential, Factory(:referential)) }
-  let!(:line) { assign(:line, Factory(:line)) }
+  let!(:referential) { assign :referential, Factory(:referential) }
+  let!(:line) { assign :line, Factory(:line) }
 
   it "should render h2 with the line name" do
     render