diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-04-23 16:29:50 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-04-23 16:29:50 +0100 |
| commit | 2e2613639f9529e67b9509b6a07fea5bf3de8459 (patch) | |
| tree | f106ad049a1343aaa0409321693eb84b5b133519 /spec/controllers | |
| parent | 6120ed2454248cf24a6ac7e1085c39faef183ddc (diff) | |
| parent | 7d6e2984f857ceaad88f50cd35705dd33b001b4d (diff) | |
Merge branch 'hotfix/0.21.0.21' into rails-3-develop
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/general_controller_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index ae8d4f256..844fcd4e6 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -169,7 +169,6 @@ describe GeneralController, "when showing the frontpage" do it 'should end a logged-in session whose ttl has expired' do session[:ttl] = Time.now - 4.hours get :frontpage - response.should redirect_to signin_path session[:user_id].should be_nil end |