diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-01 16:05:51 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-01 16:05:51 +0200 |
commit | 5c3cb47c16cacd8e9056f2a68978d69bc153a0f8 (patch) | |
tree | 39204ec0a55c20310d1a92c5958ef7522ac86135 /features/steps/group | |
parent | a73e58f70b264b36b3291bba9a8a2789235ccadb (diff) | |
parent | 2f1f05d431d1df062e46365930b98b358554a07d (diff) | |
download | gitlab-ce-5c3cb47c16cacd8e9056f2a68978d69bc153a0f8.tar.gz |
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
Conflicts:
db/schema.rb
Diffstat (limited to 'features/steps/group')
-rw-r--r-- | features/steps/group/group.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 81f1aefbd52..5ac958e3fc2 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -69,12 +69,14 @@ class Groups < Spinach::FeatureSteps end And 'submit form with new group info' do - fill_in 'group_name', :with => 'Samurai' + fill_in 'group_name', with: 'Samurai' + fill_in 'group_description', with: 'Tokugawa Shogunate' click_button "Create group" end Then 'I should see newly created group' do page.should have_content "Samurai" + page.should have_content "Tokugawa Shogunate" page.should have_content "You will only see events from projects in this group" end |