diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-19 14:02:12 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-28 09:00:30 -0500 |
| commit | 240b35b130e9391714088c52260e66cb4bfd165e (patch) | |
| tree | 7e7112db998ce10e1126881ad9edea161148bd45 | |
| parent | 2949f9b453d554bd1d9343df255b47bb3f98d182 (diff) | |
| download | gitlab-ce-240b35b130e9391714088c52260e66cb4bfd165e.tar.gz | |
Fix commits spec
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 6 | ||||
| -rw-r--r-- | features/steps/project/commits/commits.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index c8a9358fa64..351ab4148f5 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -65,12 +65,12 @@ %span.commit-info.branches %i.fa.fa-spinner.fa-spin - .widget-row.pipeline-info - - if @commit.status + - if @commit.status + .widget-row.pipeline-info .icon-container = ci_icon_for_status(@commit.status) Pipeline - = link_to "##{@commit.pipelines.last.id}", pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace" + = link_to "##{@commit.pipelines.first.id}", pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace" for = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" %span.ci-status-label diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb index 244306e8464..007dfb67a77 100644 --- a/features/steps/project/commits/commits.rb +++ b/features/steps/project/commits/commits.rb @@ -163,7 +163,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps end step 'I see commit ci info' do - expect(page).to have_content "Builds for 1 pipeline pending" + expect(page).to have_content "Pipeline #1 for 570e7b2a pending" end step 'I click status link' do @@ -171,7 +171,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps end step 'I see builds list' do - expect(page).to have_content "Builds for 1 pipeline pending" + expect(page).to have_content "Pipeline #1 for 570e7b2a pending" expect(page).to have_content "1 build" end |