Commit 1b4fd63c authored by Shinya Maeda's avatar Shinya Maeda

Fix spec

parent f2f1b9e3
...@@ -29,7 +29,7 @@ feature 'Pipelines for Merge Requests', js: true do ...@@ -29,7 +29,7 @@ feature 'Pipelines for Merge Requests', js: true do
end end
wait_for_requests wait_for_requests
expect(page).to have_selector('.sssssssss') expect(page).to have_selector('.stage-cell')
end end
end end
...@@ -66,6 +66,7 @@ feature 'Pipelines for Merge Requests', js: true do ...@@ -66,6 +66,7 @@ feature 'Pipelines for Merge Requests', js: true do
stub_ci_pipeline_to_return_yaml_file stub_ci_pipeline_to_return_yaml_file
threads = [] threads = []
threads << Thread.new do threads << Thread.new do
@merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute @merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute
end end
...@@ -79,6 +80,7 @@ feature 'Pipelines for Merge Requests', js: true do ...@@ -79,6 +80,7 @@ feature 'Pipelines for Merge Requests', js: true do
scenario 'user sees pipeline in merge request widget' do scenario 'user sees pipeline in merge request widget' do
visit project_merge_request_path(project, @merge_request) visit project_merge_request_path(project, @merge_request)
expect(page.find(".ci-widget")).to have_content(TestEnv::BRANCH_SHA['feature']) expect(page.find(".ci-widget")).to have_content(TestEnv::BRANCH_SHA['feature'])
expect(page.find(".ci-widget")).to have_content("##{@pipeline.id}") expect(page.find(".ci-widget")).to have_content("##{@pipeline.id}")
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment