summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/layouts/header/_default.html.haml2
-rw-r--r--features/project/issues/issues.feature2
-rw-r--r--features/search.feature8
-rw-r--r--spec/support/login_helpers.rb3
4 files changed, 9 insertions, 6 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 5c76c4b8fa2..8118afabe5b 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -48,7 +48,7 @@
= link_to "Profile", current_user
%li.divider
%li
- = link_to "Sign out", destroy_user_session_path, method: :delete, title: 'Sign out'
+ = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link", title: 'Sign out'
- else
%li
%div
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 2259b7125c4..358e622b736 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -219,8 +219,8 @@ Feature: Project Issues
When I click button "Unsubscribe"
Then I should see that I am unsubscribed
+ @javascript
Scenario: I submit new unassigned issue as guest
- Given I logout
Given public project "Community"
When I visit project "Community" page
And I visit project "Community" issues page
diff --git a/features/search.feature b/features/search.feature
index a946a836525..818ef436db6 100644
--- a/features/search.feature
+++ b/features/search.feature
@@ -73,13 +73,15 @@ Feature: Search
Scenario: I logout and should see project I am looking for
Given project "Shop" is public
- And I logout
+ And I logout directly
+ And I visit dashboard search page
And I search for "Sho"
Then I should see "Shop" project link
Scenario: I logout and should see issues I am looking for
Given project "Shop" is public
- And I logout
+ And I logout directly
+ And I visit dashboard search page
And project has issues
When I search for "Foo"
And I click "Issues" link
@@ -88,7 +90,7 @@ Feature: Search
Scenario: I logout and should see project code I am looking for
Given project "Shop" is public
- And I logout
+ And I logout directly
When I visit project "Shop" page
And I search for "rspec" on project page
Then I should see code results for project "Shop"
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index 7a0f078c72b..ffdf2bb0a8a 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -39,7 +39,8 @@ module LoginHelpers
# Requires Javascript driver.
def logout
- find(:css, ".fa.fa-sign-out").click
+ find(".header-user-dropdown-toggle").click
+ click_link "Sign out"
end
# Logout without JavaScript driver