aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2012-06-27 15:04:36 +0200
committerAlban Peignier2012-06-27 15:04:36 +0200
commitd3f748e11b0dd11a3678aeb45dae8143124653e7 (patch)
treec3590ad159bdeb3b244ac894722bed082acad73a
parentdd0bca3378bf8891f1710feac5ad64a4faffddd5 (diff)
downloadchouette-core-d3f748e11b0dd11a3678aeb45dae8143124653e7.tar.bz2
Use when possible a first referential created before the spec transaction
-rw-r--r--spec/controllers/routes_controller_spec.rb3
-rw-r--r--spec/controllers/stop_points_controller_spec.rb3
-rw-r--r--spec/factories.rb5
-rw-r--r--spec/requests/companies_spec.rb3
-rw-r--r--spec/requests/connection_links_spec.rb3
-rw-r--r--spec/requests/journey_pattern_spec.rb1
-rw-r--r--spec/requests/lines_spec.rb1
-rw-r--r--spec/requests/networks_spec.rb3
-rw-r--r--spec/requests/routes_spec.rb1
-rw-r--r--spec/requests/stop_areas_spec.rb3
-rw-r--r--spec/requests/stop_points_spec.rb7
-rw-r--r--spec/requests/time_tables_spec.rb3
-rw-r--r--spec/spec_helper.rb27
-rw-r--r--spec/support/referential.rb39
-rw-r--r--spec/views/companies/edit.html.erb_spec.rb2
-rw-r--r--spec/views/companies/index.html.erb_spec.rb2
-rw-r--r--spec/views/companies/new.html.erb_spec.rb2
-rw-r--r--spec/views/companies/show.html.erb_spec.rb2
-rw-r--r--spec/views/connection_links/edit.html.erb_spec.rb2
-rw-r--r--spec/views/connection_links/index.html.erb_spec.rb2
-rw-r--r--spec/views/connection_links/new.html.erb_spec.rb2
-rw-r--r--spec/views/connection_links/show.html.erb_spec.rb2
-rw-r--r--spec/views/imports/new.html.erb_spec.rb2
-rw-r--r--spec/views/lines/edit.html.erb_spec.rb2
-rw-r--r--spec/views/lines/index.html.erb_spec.rb2
-rw-r--r--spec/views/lines/new.html.erb_spec.rb2
-rw-r--r--spec/views/lines/show.html.erb_spec.rb2
-rw-r--r--spec/views/networks/edit.html.erb_spec.rb2
-rw-r--r--spec/views/networks/index.html.erb_spec.rb2
-rw-r--r--spec/views/networks/new.html.erb_spec.rb2
-rw-r--r--spec/views/networks/show.html.erb_spec.rb2
-rw-r--r--spec/views/referentials/new.html.erb_spec.rb2
-rw-r--r--spec/views/referentials/show.html.erb_spec.rb2
-rw-r--r--spec/views/routes/show.html.erb_spec.rb2
-rw-r--r--spec/views/stop_areas/edit.html.erb_spec.rb2
-rw-r--r--spec/views/stop_areas/index.html.erb_spec.rb2
-rw-r--r--spec/views/stop_areas/new.html.erb_spec.rb2
-rw-r--r--spec/views/stop_areas/show.html.erb_spec.rb2
-rw-r--r--spec/views/time_tables/edit.html.erb_spec.rb2
-rw-r--r--spec/views/time_tables/index.html.erb_spec.rb2
-rw-r--r--spec/views/time_tables/new.html.erb_spec.rb2
-rw-r--r--spec/views/time_tables/show.html.erb_spec.rb2
-rw-r--r--spec/views/vehicle_journeys/_form.html.erb_spec.rb2
-rw-r--r--spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb2
-rw-r--r--spec/views/vehicle_journeys/edit.html.erb_spec.rb2
-rw-r--r--spec/views/vehicle_journeys/new.html.erb_spec.rb2
46 files changed, 85 insertions, 81 deletions
diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb
index 92bcbf4a8..9356e1a9a 100644
--- a/spec/controllers/routes_controller_spec.rb
+++ b/spec/controllers/routes_controller_spec.rb
@@ -3,8 +3,7 @@ require 'spec_helper'
describe RoutesController do
login_user
- let!(:referential) { create(:referential).switch }
- let!(:route) { referential; Factory(:route) }
+ let!(:route) { Factory(:route) }
it { should be_kind_of(ChouetteController) }
diff --git a/spec/controllers/stop_points_controller_spec.rb b/spec/controllers/stop_points_controller_spec.rb
index b6c9e5dfa..ef63ae613 100644
--- a/spec/controllers/stop_points_controller_spec.rb
+++ b/spec/controllers/stop_points_controller_spec.rb
@@ -3,8 +3,7 @@ require 'spec_helper'
describe StopPointsController do
login_user
- let!(:referential) { create(:referential).switch }
- let!(:route) { referential; Factory(:route) }
+ let!(:route) { Factory(:route) }
let(:permutated_stop_point_ids) {
old_stop_point_ids = route.stop_points.map(&:id)
old_stop_point_ids.permutation.to_a.select { |permutated| permutated != old_stop_point_ids}.first
diff --git a/spec/factories.rb b/spec/factories.rb
index fdd23eded..faf1fef94 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -4,6 +4,7 @@ FactoryGirl.define do
f.sequence(:name) { |n| "Test #{n}" }
f.sequence(:slug) { |n| "test_#{n}" }
f.sequence(:prefix) { |n| "test_#{n}" }
+
f.time_zone "Europe/Paris"
end
@@ -15,7 +16,7 @@ FactoryGirl.define do
factory :import do |f|
f.resources { Rack::Test::UploadedFile.new 'spec/fixtures/neptune.zip', 'application/zip', false }
- f.association :referential
+ f.referential { Referential.find_by_slug("first") }
end
factory :import_log_message do |f|
@@ -24,7 +25,7 @@ FactoryGirl.define do
end
factory :export do |f|
- f.association :referential
+ f.referential { Referential.find_by_slug("first") }
end
factory :export_log_message do |f|
diff --git a/spec/requests/companies_spec.rb b/spec/requests/companies_spec.rb
index f0716dcd9..dbacd4a71 100644
--- a/spec/requests/companies_spec.rb
+++ b/spec/requests/companies_spec.rb
@@ -4,8 +4,7 @@ require 'spec_helper'
describe "Companies" do
login_user
- let(:referential) { create(:referential).switch }
- let(:companies) { referential; Array.new(2) { create(:company) } }
+ let(:companies) { Array.new(2) { create :company } }
subject { companies.first }
describe "list" do
diff --git a/spec/requests/connection_links_spec.rb b/spec/requests/connection_links_spec.rb
index 76d8a942c..48b5aa41d 100644
--- a/spec/requests/connection_links_spec.rb
+++ b/spec/requests/connection_links_spec.rb
@@ -4,8 +4,7 @@ require 'spec_helper'
describe "ConnectionLinks" do
login_user
- let(:referential) { create(:referential).switch }
- let(:connection_links) { referential; Array.new(2) { create(:connection_link) } }
+ let(:connection_links) { Array.new(2) { create(:connection_link) } }
subject { connection_links.first }
describe "list" do
diff --git a/spec/requests/journey_pattern_spec.rb b/spec/requests/journey_pattern_spec.rb
index ce36b3002..d5afcfbf0 100644
--- a/spec/requests/journey_pattern_spec.rb
+++ b/spec/requests/journey_pattern_spec.rb
@@ -4,7 +4,6 @@ require 'spec_helper'
describe "JourneyPatterns" do
login_user
- let(:referential) { create(:referential).switch }
let(:line) { Factory(:line) }
let(:route) { Factory(:route, :line => line) }
let(:journey_pattern) { Factory(:journey_pattern, :route => route) }
diff --git a/spec/requests/lines_spec.rb b/spec/requests/lines_spec.rb
index 32254bce1..10d653f30 100644
--- a/spec/requests/lines_spec.rb
+++ b/spec/requests/lines_spec.rb
@@ -4,7 +4,6 @@ require 'spec_helper'
describe "Lines" do
login_user
- let(:referential) { create(:referential).switch }
let(:network) { Factory(:network) }
let(:company) { Factory(:company) }
let(:lines) { referential; Array.new(2) { Factory(:line, :network => network, :company => company) } }
diff --git a/spec/requests/networks_spec.rb b/spec/requests/networks_spec.rb
index 1b15436ee..f73724a48 100644
--- a/spec/requests/networks_spec.rb
+++ b/spec/requests/networks_spec.rb
@@ -4,8 +4,7 @@ require 'spec_helper'
describe "Networks" do
login_user
- let(:referential) { create(:referential).switch }
- let(:networks) { referential; Array.new(2) { Factory(:network) } }
+ let(:networks) { Array.new(2) { Factory(:network) } }
subject { networks.first }
describe "list" do
diff --git a/spec/requests/routes_spec.rb b/spec/requests/routes_spec.rb
index baddfdf95..3ba1985eb 100644
--- a/spec/requests/routes_spec.rb
+++ b/spec/requests/routes_spec.rb
@@ -4,7 +4,6 @@ require 'spec_helper'
describe "Routes" do
login_user
- let(:referential) { create(:referential).switch }
let(:line) { Factory(:line) }
let(:route) { Factory(:route, :line => line) }
let(:route2) { Factory(:route, :line => line) }
diff --git a/spec/requests/stop_areas_spec.rb b/spec/requests/stop_areas_spec.rb
index b81f70a6c..5d4e3afb3 100644
--- a/spec/requests/stop_areas_spec.rb
+++ b/spec/requests/stop_areas_spec.rb
@@ -4,8 +4,7 @@ require 'spec_helper'
describe "StopAreas" do
login_user
- let(:referential) { create(:referential).switch }
- let(:stop_areas) { referential; Array.new(2) { Factory(:stop_area) } }
+ let(:stop_areas) { Array.new(2) { Factory(:stop_area) } }
subject { stop_areas.first }
describe "list" do
diff --git a/spec/requests/stop_points_spec.rb b/spec/requests/stop_points_spec.rb
index e6e3303ab..39467174f 100644
--- a/spec/requests/stop_points_spec.rb
+++ b/spec/requests/stop_points_spec.rb
@@ -4,10 +4,9 @@ require 'spec_helper'
describe "StopPoints" do
login_user
- let(:referential) { create(:referential).switch }
- let(:line) { referential; Factory(:line) }
- let(:route) { referential; Factory(:route, :line => line) }
- let(:route2) { referential; Factory(:route, :line => line) }
+ let(:line) { Factory(:line) }
+ let(:route) { Factory(:route, :line => line) }
+ let(:route2) { Factory(:route, :line => line) }
describe "from route's page to a stop points page" do
it "display route's stop points" do
diff --git a/spec/requests/time_tables_spec.rb b/spec/requests/time_tables_spec.rb
index bd401dbbf..c935587b3 100644
--- a/spec/requests/time_tables_spec.rb
+++ b/spec/requests/time_tables_spec.rb
@@ -4,8 +4,7 @@ require 'spec_helper'
describe "TimeTables" do
login_user
- let(:referential) { create(:referential).switch }
- let(:time_tables) { referential; Array.new(2) { create(:time_table) } }
+ let(:time_tables) { Array.new(2) { create(:time_table) } }
subject { time_tables.first }
describe "list" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ce52830b4..7f465ca11 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,10 +20,9 @@ require 'chouette_factories'
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
require 'will_paginate/array'
-require 'database_cleaner'
RSpec.configure do |config|
- DatabaseCleaner.logger = Rails.logger
+
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -45,28 +44,4 @@ RSpec.configure do |config|
# rspec-rails.
config.infer_base_class_for_anonymous_controllers = false
- config.before(:suite) do
- DatabaseCleaner.strategy = :transaction
-
- begin
- Apartment.database_names.each do |database|
- Apartment::Database.drop(database)
- end
- rescue
- # FIXME referentials table not found in jenkins build #13
- end
-
- DatabaseCleaner.clean_with(:truncation, {:except => %w[spatial_ref_sys geometry_columns]} )
- end
-
- config.before(:each) do
- Apartment::Database.switch(nil)
- DatabaseCleaner.start
- end
-
- config.after(:each) do
- DatabaseCleaner.clean
- Apartment::Database.switch(nil)
- end
-
end
diff --git a/spec/support/referential.rb b/spec/support/referential.rb
new file mode 100644
index 000000000..0d3a7b89a
--- /dev/null
+++ b/spec/support/referential.rb
@@ -0,0 +1,39 @@
+module ReferentialHelper
+
+ def first_referential
+ Referential.find_by_slug("first")
+ end
+
+ def self.included(base)
+ base.class_eval do
+ extend ClassMethods
+ alias_method :referential, :first_referential
+ end
+ end
+
+ module ClassMethods
+
+ def assign_referential
+ before(:each) do
+ assign :referential, referential
+ end
+ end
+
+ end
+
+end
+
+RSpec.configure do |config|
+ config.include ReferentialHelper
+
+ config.before(:suite) do
+ Referential.find_or_create_by_slug FactoryGirl.attributes_for(:referential, :slug => "first")
+ # FIXME in Rails 3.2 :
+ # Referential.where(:slug => 'first').first_or_create(FactoryGirl.attributes_for(:referential))
+ end
+
+ config.before(:each) do
+ first_referential.switch
+ end
+
+end
diff --git a/spec/views/companies/edit.html.erb_spec.rb b/spec/views/companies/edit.html.erb_spec.rb
index 22a561daf..0f7bde351 100644
--- a/spec/views/companies/edit.html.erb_spec.rb
+++ b/spec/views/companies/edit.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/companies/edit" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:company) { assign(:company, create(:company)) }
let!(:companies) { Array.new(2) { create(:company) } }
diff --git a/spec/views/companies/index.html.erb_spec.rb b/spec/views/companies/index.html.erb_spec.rb
index 23aa91def..686e8ab69 100644
--- a/spec/views/companies/index.html.erb_spec.rb
+++ b/spec/views/companies/index.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/companies/index" do
- let!(:referential) { assign( :referential, create(:referential) ) }
+ assign_referential
let!(:companies) { assign :companies, Array.new(2) { create(:company) }.paginate }
let!(:search) { assign :q, Ransack::Search.new(Chouette::Company) }
diff --git a/spec/views/companies/new.html.erb_spec.rb b/spec/views/companies/new.html.erb_spec.rb
index a28e430f3..86f252cbd 100644
--- a/spec/views/companies/new.html.erb_spec.rb
+++ b/spec/views/companies/new.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/companies/new" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:company) { assign(:company, build(:company)) }
describe "form" do
diff --git a/spec/views/companies/show.html.erb_spec.rb b/spec/views/companies/show.html.erb_spec.rb
index 7bd20df8c..eea95a406 100644
--- a/spec/views/companies/show.html.erb_spec.rb
+++ b/spec/views/companies/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/companies/show" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:company) { assign(:company, create(:company)) }
it "should render h2 with the company name" do
diff --git a/spec/views/connection_links/edit.html.erb_spec.rb b/spec/views/connection_links/edit.html.erb_spec.rb
index 331529ff8..4294cd6c0 100644
--- a/spec/views/connection_links/edit.html.erb_spec.rb
+++ b/spec/views/connection_links/edit.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/connection_links/edit" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:connection_link) { assign(:connection_link, create(:connection_link)) }
let!(:connection_links) { Array.new(2) { create(:connection_link) } }
diff --git a/spec/views/connection_links/index.html.erb_spec.rb b/spec/views/connection_links/index.html.erb_spec.rb
index 9732c16c5..39671bdc1 100644
--- a/spec/views/connection_links/index.html.erb_spec.rb
+++ b/spec/views/connection_links/index.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/connection_links/index" do
- let!(:referential) { assign( :referential, create(:referential) ) }
+ assign_referential
let!(:connection_links) { assign :connection_links, Array.new(2) { create(:connection_link) }.paginate }
let!(:search) { assign :q, Ransack::Search.new(Chouette::ConnectionLink) }
diff --git a/spec/views/connection_links/new.html.erb_spec.rb b/spec/views/connection_links/new.html.erb_spec.rb
index 1e9ee570d..c914fccbf 100644
--- a/spec/views/connection_links/new.html.erb_spec.rb
+++ b/spec/views/connection_links/new.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/connection_links/new" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:connection_link) { assign(:connection_link, build(:connection_link)) }
describe "form" do
diff --git a/spec/views/connection_links/show.html.erb_spec.rb b/spec/views/connection_links/show.html.erb_spec.rb
index 80d3adfb6..433ebc227 100644
--- a/spec/views/connection_links/show.html.erb_spec.rb
+++ b/spec/views/connection_links/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/connection_links/show" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:connection_link) { assign(:connection_link, create(:connection_link)) }
let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
diff --git a/spec/views/imports/new.html.erb_spec.rb b/spec/views/imports/new.html.erb_spec.rb
index f12932353..dd39a06d5 100644
--- a/spec/views/imports/new.html.erb_spec.rb
+++ b/spec/views/imports/new.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "imports/new.html.erb" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:import) { assign(:import, NeptuneImport.new) }
let!(:available_imports) { assign(:available_imports, []) }
diff --git a/spec/views/lines/edit.html.erb_spec.rb b/spec/views/lines/edit.html.erb_spec.rb
index ca17fbeab..9d733e600 100644
--- a/spec/views/lines/edit.html.erb_spec.rb
+++ b/spec/views/lines/edit.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/lines/edit" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:network) { create(:network) }
let!(:company) { create(:company) }
let!(:line) { assign(:line, create(:line, :network => network, :company => company)) }
diff --git a/spec/views/lines/index.html.erb_spec.rb b/spec/views/lines/index.html.erb_spec.rb
index 853da2103..2870e6b18 100644
--- a/spec/views/lines/index.html.erb_spec.rb
+++ b/spec/views/lines/index.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/lines/index" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:network) { create :network }
let!(:company) { create :company }
let!(:lines) { assign :lines, Array.new(2) { create(:line, :network => network, :company => company) }.paginate }
diff --git a/spec/views/lines/new.html.erb_spec.rb b/spec/views/lines/new.html.erb_spec.rb
index 7433162d1..cd436ffcf 100644
--- a/spec/views/lines/new.html.erb_spec.rb
+++ b/spec/views/lines/new.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/lines/new" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:network) { create(:network) }
let!(:company) { create(:company) }
let!(:line) { assign(:line, build(:line, :network => network, :company => company )) }
diff --git a/spec/views/lines/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb
index f77722672..5ef414c01 100644
--- a/spec/views/lines/show.html.erb_spec.rb
+++ b/spec/views/lines/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/lines/show" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:line) { assign :line, create(:line) }
let!(:routes) { assign :routes, Array.new(2) { create(:route, :line => line) }.paginate }
let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
diff --git a/spec/views/networks/edit.html.erb_spec.rb b/spec/views/networks/edit.html.erb_spec.rb
index b8ea64288..2dab39089 100644
--- a/spec/views/networks/edit.html.erb_spec.rb
+++ b/spec/views/networks/edit.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/networks/edit" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:network) { assign(:network, create(:network) ) }
describe "test" do
diff --git a/spec/views/networks/index.html.erb_spec.rb b/spec/views/networks/index.html.erb_spec.rb
index 6e20c2c46..7e0c24fa5 100644
--- a/spec/views/networks/index.html.erb_spec.rb
+++ b/spec/views/networks/index.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/networks/index" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:networks) { assign :networks, Array.new(2){ create(:network) }.paginate }
let!(:search) { assign :q, Ransack::Search.new(Chouette::Network) }
diff --git a/spec/views/networks/new.html.erb_spec.rb b/spec/views/networks/new.html.erb_spec.rb
index 4a2551fcd..8299fdb0d 100644
--- a/spec/views/networks/new.html.erb_spec.rb
+++ b/spec/views/networks/new.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/networks/new" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:network) { assign(:network, build(:network)) }
describe "form" do
diff --git a/spec/views/networks/show.html.erb_spec.rb b/spec/views/networks/show.html.erb_spec.rb
index 08ecdd95d..a3aab1d9e 100644
--- a/spec/views/networks/show.html.erb_spec.rb
+++ b/spec/views/networks/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/networks/show" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:network) { assign(:network, create(:network)) }
let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
diff --git a/spec/views/referentials/new.html.erb_spec.rb b/spec/views/referentials/new.html.erb_spec.rb
index dccd990cb..05766ad50 100644
--- a/spec/views/referentials/new.html.erb_spec.rb
+++ b/spec/views/referentials/new.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "referentials/new.html.erb" do
- let!(:referential) { assign(:referential, Referential.new) }
+ assign_referential
it "should have a textfield for name" do
render
diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb
index 70518a270..e7f5427c2 100644
--- a/spec/views/referentials/show.html.erb_spec.rb
+++ b/spec/views/referentials/show.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "referentials/show.html.erb" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
it "should have a title with name" do
render
diff --git a/spec/views/routes/show.html.erb_spec.rb b/spec/views/routes/show.html.erb_spec.rb
index 2f39adb9a..983b63fcb 100644
--- a/spec/views/routes/show.html.erb_spec.rb
+++ b/spec/views/routes/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/routes/show" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:line) { assign :line, create(:line) }
let!(:route) { assign :route, create(:route, :line => line) }
let!(:stop_points) { assign :stop_points, Array.new(2) { create(:stop_point) }.paginate }
diff --git a/spec/views/stop_areas/edit.html.erb_spec.rb b/spec/views/stop_areas/edit.html.erb_spec.rb
index 17e9ca104..5d3dac112 100644
--- a/spec/views/stop_areas/edit.html.erb_spec.rb
+++ b/spec/views/stop_areas/edit.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/stop_areas/edit" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:stop_area) { assign(:stop_area, create(:stop_area)) }
let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
diff --git a/spec/views/stop_areas/index.html.erb_spec.rb b/spec/views/stop_areas/index.html.erb_spec.rb
index 3adecdd0d..d758304a2 100644
--- a/spec/views/stop_areas/index.html.erb_spec.rb
+++ b/spec/views/stop_areas/index.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/stop_areas/index" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:stop_areas) { assign :stop_areas, Array.new(2) { create(:stop_area) }.paginate }
let!(:q) { assign :q, Ransack::Search.new(Chouette::StopArea) }
diff --git a/spec/views/stop_areas/new.html.erb_spec.rb b/spec/views/stop_areas/new.html.erb_spec.rb
index be1b7593b..7366a9dc5 100644
--- a/spec/views/stop_areas/new.html.erb_spec.rb
+++ b/spec/views/stop_areas/new.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/stop_areas/new" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:stop_area) { assign(:stop_area, build(:stop_area)) }
describe "form" do
diff --git a/spec/views/stop_areas/show.html.erb_spec.rb b/spec/views/stop_areas/show.html.erb_spec.rb
index b4be2c5e0..19e3d9de0 100644
--- a/spec/views/stop_areas/show.html.erb_spec.rb
+++ b/spec/views/stop_areas/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/stop_areas/show" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:stop_area) { assign :stop_area, create(:stop_area) }
let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) }
diff --git a/spec/views/time_tables/edit.html.erb_spec.rb b/spec/views/time_tables/edit.html.erb_spec.rb
index 6baf741fc..9c3cc485c 100644
--- a/spec/views/time_tables/edit.html.erb_spec.rb
+++ b/spec/views/time_tables/edit.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/time_tables/edit" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:time_table) { assign(:time_table, create(:time_table) ) }
describe "test" do
diff --git a/spec/views/time_tables/index.html.erb_spec.rb b/spec/views/time_tables/index.html.erb_spec.rb
index 7d56ad982..b8f1cb6d3 100644
--- a/spec/views/time_tables/index.html.erb_spec.rb
+++ b/spec/views/time_tables/index.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/time_tables/index" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:time_tables) { assign :time_tables, Array.new(2){ create(:time_table) }.paginate }
let!(:search) { assign :q, Ransack::Search.new(Chouette::TimeTable) }
diff --git a/spec/views/time_tables/new.html.erb_spec.rb b/spec/views/time_tables/new.html.erb_spec.rb
index dd7a35b3b..6ec28add3 100644
--- a/spec/views/time_tables/new.html.erb_spec.rb
+++ b/spec/views/time_tables/new.html.erb_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "/time_tables/new" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:time_table) { assign(:time_table, build(:time_table)) }
describe "form" do
diff --git a/spec/views/time_tables/show.html.erb_spec.rb b/spec/views/time_tables/show.html.erb_spec.rb
index 056919b2b..17449748b 100644
--- a/spec/views/time_tables/show.html.erb_spec.rb
+++ b/spec/views/time_tables/show.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/time_tables/show" do
- let!(:referential) { assign(:referential, create(:referential)) }
+ assign_referential
let!(:time_table) { assign(:time_table, create(:time_table)) }
it "should render h2 with the time_table comment" do
diff --git a/spec/views/vehicle_journeys/_form.html.erb_spec.rb b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
index 385de64c9..d095d5f14 100644
--- a/spec/views/vehicle_journeys/_form.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/vehicle_journeys/_form" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:line) { assign :line, create(:line) }
let!(:route) { assign :route, create(:route, :line => line) }
let!(:vehicle_journey) { assign :vehicle_journey, create(:vehicle_journey, :route => route) }
diff --git a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
index 70b0fc4ef..71b675704 100644
--- a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/vehicle_journeys/_vehicle_journey_at_stop_fields" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:line) { assign :line, create(:line) }
let!(:route) { assign :route, create(:route, :line => line) }
let!(:vehicle_journey) { assign :vehicle_journey, create(:vehicle_journey, :route => route) }
diff --git a/spec/views/vehicle_journeys/edit.html.erb_spec.rb b/spec/views/vehicle_journeys/edit.html.erb_spec.rb
index 7d69f3ec1..a3eb871e2 100644
--- a/spec/views/vehicle_journeys/edit.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/edit.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/vehicle_journeys/edit" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:line) { assign :line, create(:line) }
let!(:route) { assign :route, create(:route, :line => line) }
let!(:vehicle_journey) { assign :vehicle_journey, create(:vehicle_journey, :route => route) }
diff --git a/spec/views/vehicle_journeys/new.html.erb_spec.rb b/spec/views/vehicle_journeys/new.html.erb_spec.rb
index 152c48e46..495b667bd 100644
--- a/spec/views/vehicle_journeys/new.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/new.html.erb_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "/vehicle_journeys/new" do
- let!(:referential) { assign :referential, create(:referential) }
+ assign_referential
let!(:line) { assign :line, create(:line) }
let!(:route) { assign :route, create(:route, :line => line) }
let!(:vehicle_journey) { assign :vehicle_journey, build(:vehicle_journey, :route => route) }