diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-15 14:49:20 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-15 15:28:30 -0700 |
| commit | 5a8738a7b43ae567829bca36db6f13f430b56c83 (patch) | |
| tree | 228cb483e5a8ad945a521cdf02ed1af0cd3af08c | |
| parent | a65394f35cc83f342e9b2c654cfb32d3eb4c45e7 (diff) | |
| download | gitlab-ce-5a8738a7b43ae567829bca36db6f13f430b56c83.tar.gz | |
Fix Spinach merge request diff failures
gitlab-git-test `master` was updated in ff076d88, and this caused
the merge request diffs to change in a way that broke assumptions in the
Spinach tests.
Partial fix to #23378
| -rw-r--r-- | features/steps/project/merge_requests.rb | 7 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 4a67cf06fba..b0c33aa6f2f 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -114,7 +114,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps source_project: project, target_project: project, source_branch: 'fix', - target_branch: 'master', + target_branch: 'merge-test', author: project.users.first, description: "# Description header" ) @@ -137,7 +137,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps title: "Bug NS-05", source_project: project, target_project: project, - author: project.users.first) + author: project.users.first, + source_branch: 'merge-test') end step 'project "Shop" have "Feature NS-05" merged merge request' do @@ -508,7 +509,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 master to feature' + expect(page).to have_content 'Target branch changed from merge-test to feature' end step 'I click on "Email Patches"' do diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index d56274d0979..ad8ae763f6d 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -17,6 +17,7 @@ module TestEnv 'markdown' => '0ed8c6c', 'lfs' => 'be93687', 'master' => 'b83d6e3', + 'merge-test' => '5937ac0', "'test'" => 'e56497b', 'orphaned-branch' => '45127a9', 'binary-encoding' => '7b1cf43', |