aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/help_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-06-03 10:50:17 +0100
committerLouise Crow <louise.crow@gmail.com>2013-06-03 10:50:17 +0100
commit050b25bd70909913b7e42d53cb69c31b1396cc46 (patch)
treeac2f2b587ffa3504c5cf5164b36f5f436c0582f4 /spec/controllers/help_controller_spec.rb
parent4db18138584b6394286bbe374f22e6609ab79136 (diff)
parente30a8623a1706d3bad4476198085547d8f47cc88 (diff)
Merge branch 'release/0.11' into wdtk
Diffstat (limited to 'spec/controllers/help_controller_spec.rb')
-rw-r--r--spec/controllers/help_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb
index 28fd08c80..0f6f75eb9 100644
--- a/spec/controllers/help_controller_spec.rb
+++ b/spec/controllers/help_controller_spec.rb
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe HelpController, "when using help" do
- integrate_views
+ render_views
it "shows the about page" do
get :about