Commit cf6d9a22 authored by Andrew8xx8's avatar Andrew8xx8

Tests for team and group descriptions added

parent 9959669f
...@@ -25,11 +25,13 @@ class AdminGroups < Spinach::FeatureSteps ...@@ -25,11 +25,13 @@ class AdminGroups < Spinach::FeatureSteps
And 'submit form with new group info' do And 'submit form with new group info' do
fill_in 'group_name', :with => 'gitlab' fill_in 'group_name', :with => 'gitlab'
fill_in 'group_description', :with => 'Group description'
click_button "Create group" click_button "Create group"
end end
Then 'I should see newly created group' do Then 'I should see newly created group' do
page.should have_content "Group: gitlab" page.should have_content "Group: gitlab"
page.should have_content "Group description"
end end
Then 'I should be redirected to group page' do Then 'I should be redirected to group page' do
......
...@@ -18,6 +18,7 @@ class AdminTeams < Spinach::FeatureSteps ...@@ -18,6 +18,7 @@ class AdminTeams < Spinach::FeatureSteps
And 'submit form with new team info' do And 'submit form with new team info' do
fill_in 'user_team_name', with: 'gitlab' fill_in 'user_team_name', with: 'gitlab'
fill_in 'user_team_description', with: 'description'
click_button 'Create team' click_button 'Create team'
end end
...@@ -27,6 +28,7 @@ class AdminTeams < Spinach::FeatureSteps ...@@ -27,6 +28,7 @@ class AdminTeams < Spinach::FeatureSteps
And 'I should see newly created team' do And 'I should see newly created team' do
page.should have_content "Team: gitlab" page.should have_content "Team: gitlab"
page.should have_content "description"
end end
When 'I visit admin teams page' do When 'I visit admin teams page' do
......
...@@ -70,11 +70,13 @@ class Groups < Spinach::FeatureSteps ...@@ -70,11 +70,13 @@ class Groups < Spinach::FeatureSteps
And 'submit form with new group info' do 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" click_button "Create group"
end end
Then 'I should see newly created group' do Then 'I should see newly created group' do
page.should have_content "Samurai" 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" page.should have_content "You will only see events from projects in this group"
end end
......
...@@ -44,9 +44,16 @@ class Userteams < Spinach::FeatureSteps ...@@ -44,9 +44,16 @@ class Userteams < Spinach::FeatureSteps
And 'I submit form with new team info' do And 'I submit form with new team info' do
fill_in 'name', with: 'gitlab' fill_in 'name', with: 'gitlab'
fill_in 'user_team_description', with: 'team description'
click_button 'Create team' click_button 'Create team'
end 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 Then 'I should be redirected to new team page' do
team = UserTeam.last team = UserTeam.last
current_path.should == team_path(team) current_path.should == team_path(team)
......
...@@ -20,6 +20,7 @@ Feature: UserTeams ...@@ -20,6 +20,7 @@ Feature: UserTeams
When I click to "New team" link When I click to "New team" link
And I submit form with new team info And I submit form with new team info
Then I should be redirected to new team page Then I should be redirected to new team page
Then I should see newly created team
Scenario: I should see team dashboard list Scenario: I should see team dashboard list
When I have teams with projects and members When I have teams with projects and members
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment