summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 14:51:57 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 14:51:57 -0500
commit7d907acc3805a692fd9f6f29e529c5b5fe15ec11 (patch)
tree51f7ca1be840894a26e372f8f484b6417db9740c
parent865e8853369b542569693ec23a9b533481228829 (diff)
downloadgitlab-ce-7d907acc3805a692fd9f6f29e529c5b5fe15ec11.tar.gz
Fix spinach tests
-rw-r--r--features/steps/dashboard/dashboard.rb2
-rw-r--r--features/steps/project/merge_requests.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index b5980b35102..80ed4c6d64c 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -13,7 +13,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
end
step 'I should see "Shop" project CI status' do
- expect(page).to have_link "Build skipped"
+ expect(page).to have_link "Commit: skipped"
end
step 'I should see last push widget' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 3b1a00f628a..b79d19f1c58 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -525,7 +525,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I should see merge request "Bug NS-05" with CI status' do
page.within ".mr-list" do
- expect(page).to have_link "Build pending"
+ expect(page).to have_link "Pipeline: pending"
end
end