diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-08 10:34:51 -0200 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-08 10:34:51 -0200 |
commit | bf0af030b6365936d2ff529e443132d7a508bfc6 (patch) | |
tree | 32de5e8e22313ecaba23293b1fb6c2d08186a75a /features/steps/admin | |
parent | 23c1c70bf0321941ab2b9572a5d0532ed9f58002 (diff) | |
parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
download | gitlab-ce-bf0af030b6365936d2ff529e443132d7a508bfc6.tar.gz |
Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group
Diffstat (limited to 'features/steps/admin')
-rw-r--r-- | features/steps/admin/labels.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/admin/labels.rb b/features/steps/admin/labels.rb index 2ea5dffdc66..55ddcc25085 100644 --- a/features/steps/admin/labels.rb +++ b/features/steps/admin/labels.rb @@ -71,7 +71,7 @@ class Spinach::Features::AdminIssuesLabels < Spinach::FeatureSteps step 'I should see label color error message' do page.within '.label-form' do - expect(page).to have_content 'Color is invalid' + expect(page).to have_content 'Color must be a valid color code' end end |