Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions

Conflicts:
	db/schema.rb

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