diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-25 04:36:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-25 04:36:13 +0000 |
| commit | fe4ae12ec8bf82f0a6f10508f6650675deefe687 (patch) | |
| tree | f6f08e3624798f0e773809fc3a42ab05b7db904c /features/steps/project | |
| parent | 40fa5604f38409f12d709c425286a6047d2c8e06 (diff) | |
| parent | 6df22f72c6c312199c547e017ce1f947cf88e34c (diff) | |
| download | gitlab-ce-fe4ae12ec8bf82f0a6f10508f6650675deefe687.tar.gz | |
Merge branch 'rephrase-system-notes' into 'master'
Rephrase some system notes to be compatible with new system note style
See merge request !7692
Diffstat (limited to 'features/steps/project')
| -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 f728d243cdc..d2fa8cd39af 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -515,7 +515,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I should see new target branch changes' do expect(page).to have_content 'Request to merge fix into feature' - expect(page).to have_content 'Target branch changed from merge-test to feature' + expect(page).to have_content 'changed target branch from merge-test to feature' wait_for_ajax end |