Merge branch 'remove/user_teams' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev

4 files changed, 0 insertions, 89 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4dd2048ccad..f0a6012d0c2 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -148,23 +148,6 @@ describe User do
     it { @user.owned_groups.should == [@group] }
   end
 
-  describe 'teams' do
-    before do
-      ActiveRecord::Base.observers.enable(:user_observer)
-      @admin = create :user, admin: true
-      @user1 = create :user
-      @user2 = create :user
-      @team = create :user_team, owner: @user1
-    end
-
-    it { @admin.authorized_teams.should == [@team] }
-    it { @user1.authorized_teams.should == [@team] }
-    it { @user2.authorized_teams.should be_empty }
-    it { @admin.should be_can(:manage_user_team, @team) }
-    it { @user1.should be_can(:manage_user_team, @team) }
-    it { @user2.should_not be_can(:manage_user_team, @team) }
-  end
-
   describe 'namespaced' do
     before do
       ActiveRecord::Base.observers.enable(:user_observer)
diff --git a/spec/models/user_team_project_relationship_spec.rb b/spec/models/user_team_project_relationship_spec.rb
deleted file mode 100644
index 86150cf305f..00000000000
--- a/spec/models/user_team_project_relationship_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# == Schema Information
-#
-# Table name: user_team_project_relationships
-#
-#  id              :integer          not null, primary key
-#  project_id      :integer
-#  user_team_id    :integer
-#  greatest_access :integer
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#
-
-require 'spec_helper'
-
-describe UserTeamProjectRelationship do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/user_team_spec.rb b/spec/models/user_team_spec.rb
deleted file mode 100644
index d330bbf3e33..00000000000
--- a/spec/models/user_team_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# == Schema Information
-#
-# Table name: user_teams
-#
-#  id          :integer          not null, primary key
-#  name        :string(255)
-#  path        :string(255)
-#  owner_id    :integer
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  description :string(255)      default(""), not null
-#
-
-require 'spec_helper'
-
-describe UserTeam do
-  let(:team) { FactoryGirl.create :user_team }
-
-  context ".add_member" do
-    let(:user) { FactoryGirl.create :user }
-
-    it "should work" do
-      team.add_member(user, UsersProject::DEVELOPER, false)
-      team.members.should include(user)
-    end
-  end
-
-  context ".remove_member" do
-    let(:user) { FactoryGirl.create :user }
-    before { team.add_member(user, UsersProject::DEVELOPER, false) }
-
-    it "should work" do
-      team.remove_member(user)
-      team.members.should_not include(user)
-    end
-  end
-end
diff --git a/spec/models/user_team_user_relationship_spec.rb b/spec/models/user_team_user_relationship_spec.rb
deleted file mode 100644
index 981ad1e8873..00000000000
--- a/spec/models/user_team_user_relationship_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# == Schema Information
-#
-# Table name: user_team_user_relationships
-#
-#  id           :integer          not null, primary key
-#  user_id      :integer
-#  user_team_id :integer
-#  group_admin  :boolean
-#  permission   :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#
-
-require 'spec_helper'
-
-describe UserTeamUserRelationship do
-  pending "add some examples to (or delete) #{__FILE__}"
-end