Merge pull request riseuplabs#83 from azul/bugfix/login_required_flow

redirect to page with login fields on login required

Author: azul

app/controllers/common/application/rescue_errors.rb

@@ -259,7 +259,7 @@ def render_auth_error_html(exception)
       # fyi, this template will eat the alert_message
       render template: 'error/permission_denied', layout: 'notice'
     else
-      redirect_to login_path(redirect: request.path)
+      redirect_to root_path(redirect: request.path)
     end
   end
 

test/helpers/functional_test_helper.rb

@@ -14,7 +14,7 @@ def assert_permission_denied(failure_message='missing "permission denied" messag
 
   def assert_login_required
     assert_response :redirect
-    assert_redirected_to login_path(redirect: @request.path)
+    assert_redirected_to root_path(redirect: @request.path)
   end
 
   # can pass either a regexp of the flash error string,

test/integration/error_flow_test.rb

@@ -0,0 +1,24 @@
+#
+# There's a bunch of error scenarios. This test tries to make sure crabgrass
+# responds in a meaningful way:
+#
+# login required -> offer a login form
+# permission denied -> display message
+# not found -> display not found
+# hidden from user -> display not found
+#
+
+require 'integration_test'
+
+class ErrorFlowTest < IntegrationTest
+
+  def test_login_required
+    visit '/me/pages'
+    assert_content 'Login Required'
+    fill_in 'login', with: 'blue'
+    fill_in 'password', with: 'blue'
+    click_button 'Login'
+    assert_equal '/me/pages', current_path
+  end
+
+end

test/integration/people_directory_test.rb

@@ -5,10 +5,10 @@ class PeopleDirectoryTest < JavascriptIntegrationTest
   def setup
     super
     @user = users(:blue)
-    login
   end
 
   def test_contacts
+    login
     click_on 'People'
     autocomplete 'q', with: 'orange'
     within '#user_list' do
@@ -19,6 +19,7 @@ def test_contacts
   end
 
   def test_peers
+    login
     click_on 'People'
     click_on 'Peers'
     autocomplete 'q', with: 'red'
@@ -30,6 +31,7 @@ def test_peers
   end
 
   def test_search
+    login
     click_on 'People'
     find('#column_left').click_on 'Search'
     within '#user_list' do
@@ -42,4 +44,12 @@ def test_search
     end
   end
 
+  def test_logged_out
+    visit '/'
+    click_on 'People'
+    assert_content 'Search'
+    assert_no_content 'Peers'
+    assert_no_content 'Contacts'
+  end
+
 end