summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-14 19:51:54 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-14 19:51:54 +0300
commit8210d813812571b479d630ff61410347f8ebeb5b (patch)
treefa44f3fea3c878eb985f59e3245a9a6b597eb1c3 /spec
parentc69b8e04591907d030b2cd544a606fd0e576116a (diff)
downloadgitlab-ce-8210d813812571b479d630ff61410347f8ebeb5b.tar.gz
Replace old references of users_project & users_group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r--spec/factories/users_groups.rb2
-rw-r--r--spec/models/group_member_spec.rb2
-rw-r--r--spec/models/group_spec.rb2
-rw-r--r--spec/models/project_member_spec.rb2
-rw-r--r--spec/models/project_spec.rb2
-rw-r--r--spec/models/user_spec.rb2
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/factories/users_groups.rb b/spec/factories/users_groups.rb
index 931f6a25575..450a0d88b76 100644
--- a/spec/factories/users_groups.rb
+++ b/spec/factories/users_groups.rb
@@ -1,6 +1,6 @@
# == Schema Information
#
-# Table name: users_groups
+# Table name: group_members
#
# id :integer not null, primary key
# group_access :integer not null
diff --git a/spec/models/group_member_spec.rb b/spec/models/group_member_spec.rb
index 9eb4859ebd5..58205e599fe 100644
--- a/spec/models/group_member_spec.rb
+++ b/spec/models/group_member_spec.rb
@@ -1,6 +1,6 @@
# == Schema Information
#
-# Table name: users_groups
+# Table name: group_members
#
# id :integer not null, primary key
# group_access :integer not null
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 006a8402d00..1d4ba8a2b85 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -20,7 +20,7 @@ describe Group do
describe "Associations" do
it { should have_many :projects }
- it { should have_many :users_groups }
+ it { should have_many :group_members }
end
it { should validate_presence_of :name }
diff --git a/spec/models/project_member_spec.rb b/spec/models/project_member_spec.rb
index 76c5437a555..0178d065e57 100644
--- a/spec/models/project_member_spec.rb
+++ b/spec/models/project_member_spec.rb
@@ -1,6 +1,6 @@
# == Schema Information
#
-# Table name: users_projects
+# Table name: project_members
#
# id :integer not null, primary key
# user_id :integer not null
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 1c11ac39567..21800ab98ff 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -38,7 +38,7 @@ describe Project do
it { should have_many(:merge_requests).dependent(:destroy) }
it { should have_many(:issues).dependent(:destroy) }
it { should have_many(:milestones).dependent(:destroy) }
- it { should have_many(:users_projects).dependent(:destroy) }
+ it { should have_many(:project_members).dependent(:destroy) }
it { should have_many(:notes).dependent(:destroy) }
it { should have_many(:snippets).class_name('ProjectSnippet').dependent(:destroy) }
it { should have_many(:deploy_keys_projects).dependent(:destroy) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f5c42f7cb2d..0250014bc21 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -52,7 +52,7 @@ describe User do
describe "Associations" do
it { should have_one(:namespace) }
it { should have_many(:snippets).class_name('Snippet').dependent(:destroy) }
- it { should have_many(:users_projects).dependent(:destroy) }
+ it { should have_many(:project_members).dependent(:destroy) }
it { should have_many(:groups) }
it { should have_many(:keys).dependent(:destroy) }
it { should have_many(:events).class_name('Event').dependent(:destroy) }