make sure overview link is active on Users#show

2 files changed, 6 insertions, 3 deletions

diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index f90ed16..b81c43d 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,6 +1,6 @@
 %ul.nav.sidenav
-  = link_to_navigation t(:overview), @user, :active => controller?(:overviews)
-  = link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users)
+  = link_to_navigation t(:overview), @user, :active => (controller?(:users) && action?(:show))
+  = link_to_navigation t(:account_settings), edit_user_path(@user), :active => (controller?(:users) && !action?(:show))
   - # will want link for identity settings
   = link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets)
   = link_to_navigation t(:billing_settings), billing_top_link(@user), :active => controller?(:customer, :payments, :subscriptions, :credit_card_info) if APP_CONFIG[:billing]
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index 4cefe35..3785b72 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -14,7 +14,7 @@ class AccountTest < BrowserIntegrationTest
     username, password = submit_signup
     assert page.has_content?("Welcome #{username}")
     click_on 'Logout'
-    assert page.has_content?("Sign Up")
+    assert page.has_content?("Log In")
     assert_equal '/', current_path
     assert user = User.find_by_login(username)
     user.account.destroy
@@ -25,6 +25,9 @@ class AccountTest < BrowserIntegrationTest
     click_on 'Logout'
     attempt_login(username, password)
     assert page.has_content?("Welcome #{username}")
+    within('.sidenav li.active') do
+      assert page.has_content?("Overview")
+    end
     User.find_by_login(username).account.destroy
   end