diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-18 12:48:28 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-18 12:48:28 +0000 |
commit | 0ed8c4597834dfd0c2d5d2383c8d9afedb90799c (patch) | |
tree | f3b0f94ffebb22ebbf4ceb2dab984cca2d695fc9 /spec/features | |
parent | 688ff26df3f288e5cd50096a01014188a5e4011b (diff) | |
parent | abe35457ee6ef7e13cf9f67a8bd0b9bbc380dfe7 (diff) | |
download | gitlab-ce-0ed8c4597834dfd0c2d5d2383c8d9afedb90799c.tar.gz |
Merge branch 'pipelines-page-redesign' into 'master'
Pipelines page redesign
Closes #23637
![Screen_Shot_2016-11-15_at_1.36.34_PM](/uploads/edc6a58f00cca3e03ffd1689bd6eebd8/Screen_Shot_2016-11-15_at_1.36.34_PM.png)
See merge request !7487
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/commits/cherry_pick_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/pipelines_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/projects/commits/cherry_pick_spec.rb b/spec/features/projects/commits/cherry_pick_spec.rb index e45e3a36d01..d46d9e9399e 100644 --- a/spec/features/projects/commits/cherry_pick_spec.rb +++ b/spec/features/projects/commits/cherry_pick_spec.rb @@ -64,7 +64,7 @@ describe 'Cherry-pick Commits' do context "I cherry-pick a commit from a different branch", js: true do it do - find('.commit-action-buttons a.dropdown-toggle').click + find('.header-action-buttons a.dropdown-toggle').click find(:css, "a[href='#modal-cherry-pick-commit']").click page.within('#modal-cherry-pick-commit') do diff --git a/spec/features/projects/pipelines_spec.rb b/spec/features/projects/pipelines_spec.rb index db56a50e058..002c6f6b359 100644 --- a/spec/features/projects/pipelines_spec.rb +++ b/spec/features/projects/pipelines_spec.rb @@ -146,7 +146,8 @@ describe "Pipelines" do end describe 'GET /:project/pipelines/:id' do - let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master') } + let(:project) { create(:project) } + let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) } before do @success = create(:ci_build, :success, pipeline: pipeline, stage: 'build', name: 'build') |