diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-20 16:39:43 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-20 13:51:36 -0500 |
| commit | f3683b617290f7b9895308da27c2a03ab64cfcc8 (patch) | |
| tree | a67f8b30fe69531ae25d96f151b06f01610d8dbd /features | |
| parent | efb883892e13e8cb655e82f6f50c81869ccc46da (diff) | |
| download | gitlab-ce-f3683b617290f7b9895308da27c2a03ab64cfcc8.tar.gz | |
Merge branch 'secret-shortcut-feature' into 'master'
Adds "t" as a shortcut for find file anywhere
See merge request !2507
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index be993d11093..28f87a9bea0 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -41,7 +41,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should not see "master" branch' do - expect(page).not_to have_content "master" + expect(find('.merge-request-info')).not_to have_content "master" end step 'I should see "other_branch" branch' do |