From 323a2941b253f4ddd1c21f152da26b96bde77662 Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Tue, 24 Jan 2012 13:30:14 +0000 Subject: Fix a bunch of order-dependent failures This fixes a lot of the failures in #361. --- spec/controllers/general_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 bcd577484..37e3aa1e3 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -111,7 +111,7 @@ describe GeneralController, "when searching" do describe 'when using xapian search' do # rebuild xapian index after fixtures loaded - before(:all) do + before(:each) do rebuild_xapian_index end -- cgit v1.2.3 From 7ce3c4e7547fe16849ba9287dfd94d96183eafac Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Tue, 24 Jan 2012 18:16:47 +0000 Subject: Improve test isolation Towards #361. Fixes: spec/models/xapian_spec.rb spec/controllers/general_controller_spec.rb --- spec/controllers/general_controller_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (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 37e3aa1e3..2750a33f3 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -35,6 +35,7 @@ describe GeneralController, "when searching" do before(:each) do load_raw_emails_data(raw_emails) + rebuild_xapian_index end it "should render the front page successfully" do @@ -112,6 +113,7 @@ describe GeneralController, "when searching" do # rebuild xapian index after fixtures loaded before(:each) do + load_raw_emails_data(raw_emails) rebuild_xapian_index end -- cgit v1.2.3