diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-01 15:37:14 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-01 15:37:14 +0000 |
| commit | e6f6845d64f5e4be1e222124ae8d5e5f4e623530 (patch) | |
| tree | a4e73a7e722cf1c56e87291ea47ee8c8770c8af4 /spec/features | |
| parent | b3b5544a4abac853ab915a3c88b9901e36633fbd (diff) | |
| parent | f62dc67d262792829bdcaef779b3915e9cc93a4f (diff) | |
| download | gitlab-ce-e6f6845d64f5e4be1e222124ae8d5e5f4e623530.tar.gz | |
Merge branch 'refactor-merge-request-between-pipeline-and-build' into 'master'
Add suffix (`_event`) to merge request source
Closes gitlab-ee#9893
See merge request gitlab-org/gitlab-ce!25508
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb | 8 | ||||
| -rw-r--r-- | spec/features/projects/pipelines/pipeline_spec.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb index 7b473faa884..97b2aa82fce 100644 --- a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb @@ -49,7 +49,7 @@ describe 'Merge request > User sees merge request pipelines', :js do let!(:merge_request_pipeline) do Ci::CreatePipelineService.new(project, user, ref: 'feature') - .execute(:merge_request, merge_request: merge_request) + .execute(:merge_request_event, merge_request: merge_request) end before do @@ -81,7 +81,7 @@ describe 'Merge request > User sees merge request pipelines', :js do let!(:merge_request_pipeline_2) do Ci::CreatePipelineService.new(project, user, ref: 'feature') - .execute(:merge_request, merge_request: merge_request) + .execute(:merge_request_event, merge_request: merge_request) end before do @@ -220,7 +220,7 @@ describe 'Merge request > User sees merge request pipelines', :js do let!(:merge_request_pipeline) do Ci::CreatePipelineService.new(forked_project, user2, ref: 'feature') - .execute(:merge_request, merge_request: merge_request) + .execute(:merge_request_event, merge_request: merge_request) end let(:forked_project) { fork_project(project, user2, repository: true) } @@ -263,7 +263,7 @@ describe 'Merge request > User sees merge request pipelines', :js do let!(:merge_request_pipeline_2) do Ci::CreatePipelineService.new(forked_project, user2, ref: 'feature') - .execute(:merge_request, merge_request: merge_request) + .execute(:merge_request_event, merge_request: merge_request) end before do diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index 72ef460d315..36b8c15b8b6 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -666,7 +666,7 @@ describe 'Pipeline', :js do let(:pipeline) do create(:ci_pipeline, - source: :merge_request, + source: :merge_request_event, project: merge_request.source_project, ref: 'feature', sha: merge_request.diff_head_sha, |