Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/users_group.rb2
-rw-r--r--spec/models/users_group_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/users_group.rb b/app/models/users_group.rb
index b29c6fa1119..0cb26854f9c 100644
--- a/app/models/users_group.rb
+++ b/app/models/users_group.rb
@@ -18,7 +18,7 @@ class UsersGroup < ActiveRecord::Base
attr_accessible :group_access, :user_id
belongs_to :user
- belongs_to :project
+ belongs_to :group
scope :guests, -> { where(group_access: GUEST) }
scope :reporters, -> { where(group_access: REPORTER) }
diff --git a/spec/models/users_group_spec.rb b/spec/models/users_group_spec.rb
index fd847dad48c..c802b8213d5 100644
--- a/spec/models/users_group_spec.rb
+++ b/spec/models/users_group_spec.rb
@@ -13,10 +13,10 @@ describe UsersGroup do
describe "Validation" do
let!(:users_group) { create(:users_group) }
- it { should validate_presence_of(:user) }
+ it { should validate_presence_of(:user_id) }
it { should validate_uniqueness_of(:user_id).scoped_to(:group_id).with_message(/already exists/) }
- it { should validate_presence_of(:group) }
+ it { should validate_presence_of(:group_id) }
it { should ensure_inclusion_of(:group_access).in_array(UsersGroup.group_access_roles.values) }
end