diff options
author | James Lopez <james@jameslopez.es> | 2016-06-16 15:01:27 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-16 15:01:27 +0200 |
commit | b3a0a1c3155702e2deddade0fea3e79087b40da4 (patch) | |
tree | 096bf8b46f1d9dc4be16cf29551a27d8fd6c8d7b /features/steps/dashboard | |
parent | 8ac52f49c024775311a0736ddad964e85c8f6ed2 (diff) | |
parent | 2a747d386dbdc05453fce6b8be3f483e8cd9e796 (diff) | |
download | gitlab-ce-b3a0a1c3155702e2deddade0fea3e79087b40da4.tar.gz |
fixed merge conflicts on UI branch
Diffstat (limited to 'features/steps/dashboard')
-rw-r--r-- | features/steps/dashboard/group.rb | 2 | ||||
-rw-r--r-- | features/steps/dashboard/new_project.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/features/steps/dashboard/group.rb b/features/steps/dashboard/group.rb index 0c6a0ae3725..9b79a3be49b 100644 --- a/features/steps/dashboard/group.rb +++ b/features/steps/dashboard/group.rb @@ -62,6 +62,6 @@ class Spinach::Features::DashboardGroup < Spinach::FeatureSteps end step 'I should see the "Can not leave message"' do - expect(page).to have_content "You can not leave Owned group because you're the last owner" + expect(page).to have_content "You can not leave the \"Owned\" group." end end diff --git a/features/steps/dashboard/new_project.rb b/features/steps/dashboard/new_project.rb index df84d3e3db7..29e6b9f1a01 100644 --- a/features/steps/dashboard/new_project.rb +++ b/features/steps/dashboard/new_project.rb @@ -10,7 +10,8 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps end step 'I see "New Project" page' do - expect(page).to have_content('Project path') + expect(page).to have_content('Project owner') + expect(page).to have_content('Project name') end step 'I see all possible import optios' do |