aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/admin_general_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-10-30 11:22:08 +0000
committerLouise Crow <louise.crow@gmail.com>2014-10-30 11:22:08 +0000
commit44a3f6c44ffe76b461444c4739f695e54eca6c56 (patch)
tree76e9053f7959f7f0ddc2eb3bb7233f2a8d5055bf /spec/controllers/admin_general_controller_spec.rb
parent331ed724fb2f989510af6766a11e9ad2eac2fcf0 (diff)
parentaf1f0242ca7f19672725f8a60050902976c5f0a1 (diff)
Merge branch 'issues/1457-close-change-request-without-email' into rails-3-develop
Diffstat (limited to 'spec/controllers/admin_general_controller_spec.rb')
-rw-r--r--spec/controllers/admin_general_controller_spec.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/controllers/admin_general_controller_spec.rb b/spec/controllers/admin_general_controller_spec.rb
index 971960762..cc2ec41b4 100644
--- a/spec/controllers/admin_general_controller_spec.rb
+++ b/spec/controllers/admin_general_controller_spec.rb
@@ -8,13 +8,8 @@ describe AdminGeneralController do
before { basic_auth_login @request }
it "should render the front page" do
- get :index, :suppress_redirect => 1
- response.should render_template('index')
- end
-
- it "should redirect to include trailing slash" do
get :index
- response.should redirect_to admin_general_index_url(:trailing_slash => true)
+ response.should render_template('index')
end
end