Skip to content
Snippets Groups Projects
Commit 77febe8f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fixed mistake and mock warning

parent 23c99a98
No related branches found
No related tags found
1 merge request!1Fix Links To Gitlab Cloud
Loading
@@ -80,7 +80,7 @@ class User < ActiveRecord::Base
Loading
@@ -80,7 +80,7 @@ class User < ActiveRecord::Base
# Groups # Groups
has_many :users_groups, dependent: :destroy has_many :users_groups, dependent: :destroy
has_many :groups, through: :users_groups has_many :groups, through: :users_groups
has_many :owned_groups, -> { where user_group: { group_access: UsersGroup::OWNER } }, through: :users_groups, source: :group has_many :owned_groups, -> { where users_groups: { group_access: UsersGroup::OWNER } }, through: :users_groups, source: :group
# Projects # Projects
has_many :groups_projects, through: :groups, source: :projects has_many :groups_projects, through: :groups, source: :projects
has_many :personal_projects, through: :namespace, source: :projects has_many :personal_projects, through: :namespace, source: :projects
Loading
Loading
Loading
@@ -12,7 +12,7 @@ def common_mentionable_setup
Loading
@@ -12,7 +12,7 @@ def common_mentionable_setup
let(:mentioned_issue) { create :issue, project: mproject } let(:mentioned_issue) { create :issue, project: mproject }
let(:other_issue) { create :issue, project: mproject } let(:other_issue) { create :issue, project: mproject }
let(:mentioned_mr) { create :merge_request, target_project: mproject, source_branch: 'different' } let(:mentioned_mr) { create :merge_request, target_project: mproject, source_branch: 'different' }
let(:mentioned_commit) { mock('commit', sha: '1234567890abcdef').as_null_object } let(:mentioned_commit) { double('commit', sha: '1234567890abcdef').as_null_object }
   
# Override to add known commits to the repository stub. # Override to add known commits to the repository stub.
let(:extra_commits) { [] } let(:extra_commits) { [] }
Loading
@@ -30,7 +30,7 @@ def common_mentionable_setup
Loading
@@ -30,7 +30,7 @@ def common_mentionable_setup
commitmap = { '123456' => mentioned_commit } commitmap = { '123456' => mentioned_commit }
extra_commits.each { |c| commitmap[c.sha[0..5]] = c } extra_commits.each { |c| commitmap[c.sha[0..5]] = c }
   
repo = mock('repository') repo = double('repository')
repo.stub(:commit) { |sha| commitmap[sha] } repo.stub(:commit) { |sha| commitmap[sha] }
mproject.stub(repository: repo) mproject.stub(repository: repo)
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment