diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-25 13:36:15 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-25 13:36:15 +0400 |
commit | 20a4742efdc9ed96da4ba3cbf6f513aff75c7ab1 (patch) | |
tree | e5c801e1e2711908d44fceb14192379851ac7847 /features | |
parent | 00e4a479d3732a528745513e4150fe28fee178e2 (diff) |
Fixing team tests
Diffstat (limited to 'features')
-rw-r--r-- | features/dashboard/dashboard.feature | 6 | ||||
-rw-r--r-- | features/steps/userteams/userteams.rb | 16 | ||||
-rw-r--r-- | features/teams/team.feature | 7 |
3 files changed, 8 insertions, 21 deletions
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature index 759843692b8..695148b5cdf 100644 --- a/features/dashboard/dashboard.feature +++ b/features/dashboard/dashboard.feature @@ -16,12 +16,6 @@ Feature: Dashboard And I visit dashboard page Then I should see groups list - Scenario: I should see correct projects count - Given I have group with projects - And group has a projects that does not belongs to me - When I visit dashboard page - Then I should see 1 project at group list - Scenario: I should see last push widget Then I should see last push widget And I click "Create Merge Request" link diff --git a/features/steps/userteams/userteams.rb b/features/steps/userteams/userteams.rb index 39a2588ec92..be83b4bac05 100644 --- a/features/steps/userteams/userteams.rb +++ b/features/steps/userteams/userteams.rb @@ -8,16 +8,16 @@ class Userteams < Spinach::FeatureSteps end Then 'I should see dashboard page without teams info block' do - page.has_no_css?(".teams_box").must_equal true + page.has_no_css?(".teams-box").must_equal true end When 'I have teams with my membership' do - team = create :user_team + team = create :user_team, owner: current_user team.add_member(current_user, UserTeam.access_roles["Master"], true) end Then 'I should see dashboard page with teams information block' do - page.should have_css(".teams_box") + page.should have_css(".teams-box") end When 'exist user teams' do @@ -53,7 +53,7 @@ class Userteams < Spinach::FeatureSteps end When 'I have teams with projects and members' do - team = create :user_team + team = create :user_team, owner: current_user @project = create :project team.add_member(current_user, UserTeam.access_roles["Master"], true) team.assign_to_project(@project, UserTeam.access_roles["Master"]) @@ -92,7 +92,7 @@ class Userteams < Spinach::FeatureSteps end Given 'I have team with projects and members' do - team = create :user_team + team = create :user_team, owner: current_user project = create :project user = create :user team.add_member(current_user, UserTeam.access_roles["Master"], true) @@ -190,11 +190,11 @@ class Userteams < Spinach::FeatureSteps end And 'I have my own project without teams' do - @project = create :project, creator: current_user + @project = create :project, namespace: current_user.namespace end And 'I visit my team page' do - team = UserTeam.last + team = UserTeam.where(owner_id: current_user.id).last visit team_path(team) end @@ -213,7 +213,7 @@ class Userteams < Spinach::FeatureSteps When 'I submit form with selected project and max access' do within "#assign_projects" do - select @project.name, :from => "project_ids" + select @project.name_with_namespace, :from => "project_ids" select "Reporter", :from => "greatest_project_access" end click_button "Add" diff --git a/features/teams/team.feature b/features/teams/team.feature index b62d230fd56..9255e0daadb 100644 --- a/features/teams/team.feature +++ b/features/teams/team.feature @@ -14,13 +14,6 @@ Feature: UserTeams And I visit dashboard page Then I should see dashboard page with teams information block - Scenario: I should see all teams list - When exist user teams - And I visit dashboard page - And I click on "All teams" link - Then I should see "All teams" page - And I should see exist teams in teams list - Scenario: I should can create new team When I have teams with my membership And I visit dashboard page |