From 0bf2e8d5cb7a34f3bc932d88f0ec4293320aca4d Mon Sep 17 00:00:00 2001 From: James McKinney Date: Sun, 16 Oct 2011 20:12:26 -0400 Subject: allow specs to run independently --- spec/controllers/general_controller_spec.rb | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'spec/controllers/general_controller_spec.rb') diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 054b9881f..a8f8bc901 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -2,15 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe GeneralController, "when searching" do integrate_views - fixtures [ :public_bodies, - :public_body_translations, - :users, - :raw_emails, - :info_requests, - :info_request_events, - :outgoing_messages, - :incoming_messages, - :comments ] + fixtures [ + :public_bodies, + :public_body_translations, + :public_body_versions, + :users, + :info_requests, + :raw_emails, + :incoming_messages, + :outgoing_messages, + :comments, + :info_request_events, + :track_things, + ] before(:each) do load_raw_emails_data(raw_emails) -- cgit v1.2.3 From b7075181100852ff2117d61b02881e84deaafa87 Mon Sep 17 00:00:00 2001 From: James McKinney Date: Mon, 17 Oct 2011 01:15:25 -0400 Subject: fix spec example for 1.9 --- spec/controllers/general_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/controllers/general_controller_spec.rb') diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 054b9881f..65b8d67a0 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -70,13 +70,13 @@ describe GeneralController, "when searching" do describe "when using different locale settings" do home_link_regex = /href=".*\/en"/ it "should generate URLs with a locale prepended when there's more than one locale set" do - ActionController::Routing::Routes.add_filters(['conditionallyprependlocale']) + ActionController::Routing::Routes.add_filters('conditionallyprependlocale') get :frontpage response.should have_text(home_link_regex) end it "should generate URLs without a locale prepended when there's only one locale set" do - ActionController::Routing::Routes.add_filters(['conditionallyprependlocale']) + ActionController::Routing::Routes.add_filters('conditionallyprependlocale') old_available_locales = FastGettext.default_available_locales available_locales = ['en'] FastGettext.default_available_locales = available_locales -- cgit v1.2.3