summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-08-04 20:18:05 +0900
committerShinya Maeda <shinya@gitlab.com>2017-08-04 20:18:05 +0900
commit1b4fd63cf26ae0f19ec7735fd56bc0df6ce07058 (patch)
treec6d4541d6839e0b86875f2eac7c915b6b7aad4f6
parentf2f1b9e3dd10f1f527660e131fb307c68214246a (diff)
downloadgitlab-ce-1b4fd63cf26ae0f19ec7735fd56bc0df6ce07058.tar.gz
Fix spec
-rw-r--r--spec/features/merge_requests/pipelines_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/features/merge_requests/pipelines_spec.rb b/spec/features/merge_requests/pipelines_spec.rb
index 2136f7d829c..44b965d5e6a 100644
--- a/spec/features/merge_requests/pipelines_spec.rb
+++ b/spec/features/merge_requests/pipelines_spec.rb
@@ -29,7 +29,7 @@ feature 'Pipelines for Merge Requests', js: true do
end
wait_for_requests
- expect(page).to have_selector('.sssssssss')
+ expect(page).to have_selector('.stage-cell')
end
end
@@ -66,6 +66,7 @@ feature 'Pipelines for Merge Requests', js: true do
stub_ci_pipeline_to_return_yaml_file
threads = []
+
threads << Thread.new do
@merge_request = MergeRequests::CreateService.new(project, user, merge_request_params).execute
end
@@ -79,6 +80,7 @@ feature 'Pipelines for Merge Requests', js: true do
scenario 'user sees pipeline in merge request widget' do
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("##{@pipeline.id}")
end