diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-17 10:48:49 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-17 11:10:11 -0500 |
| commit | 2c23465d05fa1efa4213bd5d7b0e86b1cd521212 (patch) | |
| tree | ee62cfba433516cc1c14b86fdc2c7dee67ba872d | |
| parent | bfe2259bb76b320bd148de4fbdcebfd1b70a59ba (diff) | |
| download | gitlab-ce-2c23465d05fa1efa4213bd5d7b0e86b1cd521212.tar.gz | |
Move deployable conditional to variable; fix pipelines_spec
| -rw-r--r-- | app/views/projects/ci/builds/_build_pipeline.html.haml | 5 | ||||
| -rw-r--r-- | spec/features/projects/pipelines_spec.rb | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml index 13088ef64d9..04cbd0c3591 100644 --- a/app/views/projects/ci/builds/_build_pipeline.html.haml +++ b/app/views/projects/ci/builds/_build_pipeline.html.haml @@ -1,6 +1,7 @@ -%li.build{class: ("playable" if subject.playable? && can?(current_user, :update_build, @project))} +- is_playable = subject.playable? && can?(current_user, :update_build, @project) +%li.build{class: ("playable" if is_playable)} .build-content - - if subject.playable? && can?(current_user, :update_build, @project) + - if is_playable = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do = render_status_with_link('build', 'play') = subject.name diff --git a/spec/features/projects/pipelines_spec.rb b/spec/features/projects/pipelines_spec.rb index 29d150bc597..47482bc3cc9 100644 --- a/spec/features/projects/pipelines_spec.rb +++ b/spec/features/projects/pipelines_spec.rb @@ -193,7 +193,11 @@ describe "Pipelines" do end context 'playing manual build' do - before { click_link('Play') } + before do + within '.pipeline-holder' do + click_link('Play') + end + end it { expect(@manual.reload).to be_pending } end |