summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-09 21:06:04 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-09 21:06:04 +0100
commit7a4d468576380ba0c80b4e16bbad18b3792566f7 (patch)
tree8f72f01613f39b288dd92e02f59ba921a6ed39b1 /features
parent7b50965e9990bcb88f56b771d47514cbeb5316e5 (diff)
parent23522a9b34c30d61e950820a197b6bd353ba1914 (diff)
downloadgitlab-ce-7a4d468576380ba0c80b4e16bbad18b3792566f7.tar.gz
Merge remote-tracking branch 'origin/mr-broken'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-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 f0fbd8a826a..63f0ec2b6e8 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -12,7 +12,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
end
step 'I should see "Shop" project CI status' do
- expect(page).to have_link "Build status: skipped"
+ expect(page).to have_link "Build 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 822cf0ffe1c..0107d9d8486 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -367,7 +367,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 status: pending"
+ expect(page).to have_link "Build pending"
end
end