diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-20 16:39:43 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-20 16:39:43 +0000 |
| commit | 5ad60c5ddacc63ab1a0bc08a9e30557aa71b1f37 (patch) | |
| tree | cba53dad52cc26a4b8320ba095b2e8fdccdb7c20 /features | |
| parent | 41c5c391b3524e3e0b2dcfbe1d4cb5d8f0f231ad (diff) | |
| parent | 7377abf84a7fc20eb93938f73ce77ae26d3ec8ec (diff) | |
| download | gitlab-ce-5ad60c5ddacc63ab1a0bc08a9e30557aa71b1f37.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 bec9920f91b..8af635689e0 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 |