diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-12-12 23:20:08 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-12-12 23:20:08 +0800 |
| commit | e5acebd9b99e3207427700144d9c83bcec4c629c (patch) | |
| tree | 2cbd03d35e4b97046c71aac8471545e4cbe3bf82 /spec/support | |
| parent | c0dfa0c609805558b30f11046eedadfb8a14886d (diff) | |
| parent | 7e9a8bb760cf6f9c7b3aa6b2b98bff30b58bc325 (diff) | |
| download | gitlab-ce-e5acebd9b99e3207427700144d9c83bcec4c629c.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master:
API: Fix groups filter
fix: removed signed_out notification
Fix typo in curl example request
Fix typo
Change docs title to represent the edition
remove left_align setting from notification setting dropdown in favor of a pure css solution
fix alignment for notification settings ajax response
[ci skip] Update "Installation from source" guide for 8.15.0
Group links spec update
Stop replacing `$your_email` with the user's email
Updates the font weight of button styles because of the change to system fonts
Updated JS based on review Fixed group links dropdown to match
Allow branch names with dots on API endpoint
Use a single query in Projects::ProjectMembersController to fetch members
Use gitlab-workhose 1.1.1
Updated members dropdowns
Use default btn styling for Housekeeping button on projects settings page
fix display hook error message
API: Endpoint to expose personal snippets as /snippets
Removed leave buttons from settings dropdowns
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/login_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index c0b3e83244d..ad1eed5b369 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -75,7 +75,8 @@ module LoginHelpers def logout find(".header-user-dropdown-toggle").click click_link "Sign out" - expect(page).to have_content('Signed out successfully') + # check the sign_in button + expect(page).to have_button('Sign in') end # Logout without JavaScript driver |