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

Conflicts:
	db/schema.rb

5 files changed, 15 insertions, 1 deletions

diff --git a/features/steps/admin/admin_groups.rb b/features/steps/admin/admin_groups.rb
index cbca2daa701..167763b6912 100644
--- a/features/steps/admin/admin_groups.rb
+++ b/features/steps/admin/admin_groups.rb
@@ -25,11 +25,13 @@ class AdminGroups < Spinach::FeatureSteps
 
   And 'submit form with new group info' do
     fill_in 'group_name', :with => 'gitlab'
+    fill_in 'group_description', :with => 'Group description'
     click_button "Create group"
   end
 
   Then 'I should see newly created group' do
     page.should have_content "Group: gitlab"
+    page.should have_content "Group description"
   end
 
   Then 'I should be redirected to group page' do
diff --git a/features/steps/admin/admin_teams.rb b/features/steps/admin/admin_teams.rb
index 637fc4e58f3..6423f3dfd9b 100644
--- a/features/steps/admin/admin_teams.rb
+++ b/features/steps/admin/admin_teams.rb
@@ -18,6 +18,7 @@ class AdminTeams < Spinach::FeatureSteps
 
   And 'submit form with new team info' do
     fill_in 'user_team_name', with: 'gitlab'
+    fill_in 'user_team_description', with: 'description'
     click_button 'Create team'
   end
 
@@ -27,6 +28,7 @@ class AdminTeams < Spinach::FeatureSteps
 
   And 'I should see newly created team' do
     page.should have_content "Team: gitlab"
+    page.should have_content "description"
   end
 
   When 'I visit admin teams page' do
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
 
diff --git a/features/steps/userteams/userteams.rb b/features/steps/userteams/userteams.rb
index 1abb0f49122..862259dcb4e 100644
--- a/features/steps/userteams/userteams.rb
+++ b/features/steps/userteams/userteams.rb
@@ -44,9 +44,16 @@ class Userteams < Spinach::FeatureSteps
 
     And 'I submit form with new team info' do
       fill_in 'name', with: 'gitlab'
+
+      fill_in 'user_team_description', with: 'team description'
       click_button 'Create team'
     end
 
+    And 'I should see newly created team' do
+      page.should have_content "gitlab"
+      page.should have_content "team description"
+    end
+
     Then 'I should be redirected to new team page' do
       team = UserTeam.last
       current_path.should == team_path(team)
diff --git a/features/teams/team.feature b/features/teams/team.feature
index 9255e0daadb..f7774597dc3 100644
--- a/features/teams/team.feature
+++ b/features/teams/team.feature
@@ -20,6 +20,7 @@ Feature: UserTeams
     When I click to "New team" link
     And I submit form with new team info
     Then I should be redirected to new team page
+    Then I should see newly created team
 
   Scenario: I should see team dashboard list
     When I have teams with projects and members