diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-08 17:06:11 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-08 17:06:11 +0000 |
| commit | 54d0ff982b41cc6e362529530a8a36ca4934f376 (patch) | |
| tree | 2dc78ac25d76d1970ba3fb60dc9c9e863a23598a /spec | |
| parent | 98368d6ec8ae038c33b2ba1bb9f2f71d0f3eac64 (diff) | |
| parent | ab85d9694dff12eb5646e5468cdcc820a647b396 (diff) | |
| download | gitlab-ce-54d0ff982b41cc6e362529530a8a36ca4934f376.tar.gz | |
Merge branch 'build-related-fixes' into 'master'
Build related UI fixes
## Before

## After

See merge request !2015
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/builds_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb index 5213ce1099f..1f99a808f87 100644 --- a/spec/features/builds_spec.rb +++ b/spec/features/builds_spec.rb @@ -19,7 +19,7 @@ describe "Builds" do end it { expect(page).to have_content 'Running' } - it { expect(page).to have_content 'Cancel all' } + it { expect(page).to have_content 'Cancel running' } it { expect(page).to have_content @build.short_sha } it { expect(page).to have_content @build.ref } it { expect(page).to have_content @build.name } @@ -32,7 +32,7 @@ describe "Builds" do end it { expect(page).to have_content 'No builds to show' } - it { expect(page).to have_content 'Cancel all' } + it { expect(page).to have_content 'Cancel running' } end context "All builds" do @@ -45,7 +45,7 @@ describe "Builds" do it { expect(page).to have_content @build.short_sha } it { expect(page).to have_content @build.ref } it { expect(page).to have_content @build.name } - it { expect(page).to_not have_content 'Cancel all' } + it { expect(page).to_not have_content 'Cancel running' } end end @@ -53,11 +53,11 @@ describe "Builds" do before do @build.run! visit namespace_project_builds_path(@gl_project.namespace, @gl_project) - click_link "Cancel all" + click_link "Cancel running" end it { expect(page).to have_content 'No builds to show' } - it { expect(page).to_not have_content 'Cancel all' } + it { expect(page).to_not have_content 'Cancel running' } end describe "GET /:project/builds/:id" do |
