aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/general_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-11-22 09:49:24 +0000
committerLouise Crow <louise.crow@gmail.com>2012-11-22 09:49:24 +0000
commit09ffe8277417a1e486ae60db3254d511b4c64d33 (patch)
tree245f90f83681210ceec19a35f29fbf0e06c10252 /spec/controllers/general_controller_spec.rb
parent766da660994dbe7c86f556d9cf863411814622fe (diff)
parent640aa149fd321658a33466df7b53947b78bccd81 (diff)
Merge branch 'develop' into wdtk
Diffstat (limited to 'spec/controllers/general_controller_spec.rb')
-rw-r--r--spec/controllers/general_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 935f8eab6..830486493 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -144,7 +144,7 @@ describe GeneralController, "when showing the front page with fixture data" do
describe 'when constructing the list of recent requests' do
before(:each) do
- rebuild_xapian_index
+ get_fixtures_xapian_index
end
describe 'when there are fewer than five successful requests' do
@@ -189,8 +189,8 @@ describe GeneralController, 'when using xapian search' do
# rebuild xapian index after fixtures loaded
before(:each) do
- load_raw_emails_data
- rebuild_xapian_index
+ load_raw_emails_data
+ get_fixtures_xapian_index
end
it "should redirect from search query URL to pretty URL" do