From 20a4742efdc9ed96da4ba3cbf6f513aff75c7ab1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 25 Jan 2013 11:36:15 +0200
Subject: [PATCH] Fixing team tests

---
 app/assets/stylesheets/sections/projects.scss |  2 --
 app/views/dashboard/_teams.html.haml          |  2 +-
 features/dashboard/dashboard.feature          |  6 ------
 features/steps/userteams/userteams.rb         | 16 ++++++++--------
 features/teams/team.feature                   |  7 -------
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index ee2c379f2ab..b6db65adff1 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -6,8 +6,6 @@
   .side {
     @extend .right;
 
-    .groups_box,
-    .teams_box,
     .projects_box {
       > .title {
         padding: 2px 15px;
diff --git a/app/views/dashboard/_teams.html.haml b/app/views/dashboard/_teams.html.haml
index 7912175b760..5b2ea7a2384 100644
--- a/app/views/dashboard/_teams.html.haml
+++ b/app/views/dashboard/_teams.html.haml
@@ -1,4 +1,4 @@
-.ui-box
+.ui-box.teams-box
   %h5.title
     Teams
     %small
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
-- 
GitLab