summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-28 17:25:34 +0000
committerDouwe Maan <douwe@gitlab.com>2017-08-28 17:25:34 +0000
commitb3a52448bb3315a412aababd3f9298e387effe01 (patch)
tree541477d555cf20c45ca96009eaadfc277b9d229d
parent1a09c20700a6ec227e5e4fcc6ec47252eb4f1f5e (diff)
parent8d72f0973032afa79729d651ebfaa786a5f519f2 (diff)
downloadgitlab-ce-b3a52448bb3315a412aababd3f9298e387effe01.tar.gz
Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master'
Fix a transient failure in mini_pipeline_graph_spec Closes #34323 See merge request !13844
-rw-r--r--spec/features/projects/commit/mini_pipeline_graph_spec.rb18
1 files changed, 4 insertions, 14 deletions
diff --git a/spec/features/projects/commit/mini_pipeline_graph_spec.rb b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
index 2ef74e8857c..807a2189cc4 100644
--- a/spec/features/projects/commit/mini_pipeline_graph_spec.rb
+++ b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
@@ -1,13 +1,8 @@
require 'rails_helper'
feature 'Mini Pipeline Graph in Commit View', :js do
- let(:user) { create(:user) }
let(:project) { create(:project, :public, :repository) }
- before do
- sign_in(user)
- end
-
context 'when commit has pipelines' do
let(:pipeline) do
create(:ci_empty_pipeline,
@@ -15,21 +10,14 @@ feature 'Mini Pipeline Graph in Commit View', :js do
ref: project.default_branch,
sha: project.commit.sha)
end
+ let(:build) { create(:ci_build, pipeline: pipeline) }
- let(:build) do
- create(:ci_build, pipeline: pipeline)
- end
-
- before do
+ it 'displays a mini pipeline graph' do
build.run
visit project_commit_path(project, project.commit.id)
- end
- it 'should display a mini pipeline graph' do
expect(page).to have_selector('.mr-widget-pipeline-graph')
- end
- it 'should show the builds list when stage is clicked' do
first('.mini-pipeline-graph-dropdown-toggle').click
wait_for_requests
@@ -38,6 +26,8 @@ feature 'Mini Pipeline Graph in Commit View', :js do
expect(page).to have_selector('.ci-status-icon-running')
expect(page).to have_content(build.stage)
end
+
+ build.drop
end
end