aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/help_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-07-29 16:32:51 +0100
committerLouise Crow <louise.crow@gmail.com>2013-07-29 16:32:51 +0100
commit6b6ada3571d9d05d8b2c6a59b5134e634775f617 (patch)
treeb81a5421bb40de9b603c5a386b5b44a02b1e931b /spec/controllers/help_controller_spec.rb
parentb17910d494ae1a459c83b43e4b668ca4e80fc680 (diff)
parenta73ffdc2a6801961ce2b5c9719651231dd484021 (diff)
Merge branch 'feature/localisation-fixes' into rails-3-develop
Diffstat (limited to 'spec/controllers/help_controller_spec.rb')
-rw-r--r--spec/controllers/help_controller_spec.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb
index c47e1abd3..cc024f840 100644
--- a/spec/controllers/help_controller_spec.rb
+++ b/spec/controllers/help_controller_spec.rb
@@ -31,17 +31,11 @@ describe HelpController, "when using help" do
describe 'when requesting a page in a supported locale ' do
before do
- # Allow us to supply the locale manually
- RoutingFilter.active = false
# Prepend our fixture templates
fixture_theme_path = File.join(Rails.root, 'spec', 'fixtures', 'theme_views', 'theme_one')
controller.prepend_view_path fixture_theme_path
end
- after do
- RoutingFilter.active = true
- end
-
it 'should render the locale-specific template if available' do
get :contact, {:locale => 'es'}
response.body.should match('contáctenos theme one')