diff options
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/dashboard/todos.rb | 2 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb index fd12c7c408c..4a33babe3bd 100644 --- a/features/steps/dashboard/todos.rb +++ b/features/steps/dashboard/todos.rb @@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps end step 'I should be directed to the corresponding page' do - page.should have_css('.identifier', text: 'Merge Request !1') + page.should have_css('.identifier', text: 'Merge request !1') # Merge request page loads and issues a number of Ajax requests wait_for_requests end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 3994eeb397e..54b6352c952 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -555,8 +555,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step '"Bug NS-05" has CI status' do project = merge_request.source_project project.enable_ci - pipeline = create :ci_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch - merge_request.update(head_pipeline: pipeline) + + pipeline = + create(:ci_pipeline, + project: project, + sha: merge_request.diff_head_sha, + ref: merge_request.source_branch, + head_pipeline_of: merge_request) + create :ci_build, pipeline: pipeline end |