diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index ecc446f..6343b1f 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -2,7 +2,7 @@ class AccountController < ApplicationController inverse_captcha :field => 'e_mail' - require_ssl :except => [ :login_popup ] + require_ssl :except => [ :login_popup, :logout_popup ] # say something nice, you goof! something sweet. def index diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index 21ebbe5..c948503 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -529,6 +529,12 @@ class AccountControllerTest < Test::Unit::TestCase assert_response :success end + should 'allow logout_popup without SSL' do + @request.expects(:ssl?).returns(false).at_least_once + get :logout_popup + assert_response :success + end + should 'point to SSL URL in login popup' do get :login_popup assert_tag :tag => 'form', :attributes => { :action => /^https:\/\// } -- libgit2 0.21.2