kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix specs and rubocop warnings

Browse source
This commit is contained in:
Rémy Coutable 2016-01-14 10:04:48 +01:00
parent 33ea09bdf9
commit e918493f55
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/steps/shared/project.rb
View file

@ -224,7 +224,7 @@ module SharedProject
end end
def user_owns_project(user_name:, project_name:, visibility: :private) def user_owns_project(user_name:, project_name:, visibility: :private)
user = user_exists(user_name, username: user_name.underscore) user = user_exists(user_name, username: user_name.gsub(/\s/, '').underscore)
project = Project.find_by(name: project_name) project = Project.find_by(name: project_name)
project ||= create(:empty_project, visibility, name: project_name, namespace: user.namespace) project ||= create(:empty_project, visibility, name: project_name, namespace: user.namespace)
project.team << [user, :master] project.team << [user, :master]

4
spec/models/note_spec.rb
View file

@ -186,12 +186,12 @@ describe Note, models: true do
let(:ext_proj) { create(:project, :public) } let(:ext_proj) { create(:project, :public) }
let(:ext_issue) { create(:issue, project: ext_proj) } let(:ext_issue) { create(:issue, project: ext_proj) }
let(:note) { let(:note) do
create :note, create :note,
noteable: ext_issue, project: ext_proj, noteable: ext_issue, project: ext_proj,
note: "mentioned in issue #{private_issue.to_reference(ext_proj)}", note: "mentioned in issue #{private_issue.to_reference(ext_proj)}",
system: true system: true
} end
it "returns true" do it "returns true" do
expect(note.cross_reference_not_visible_for?(ext_issue.author)).to be_truthy expect(note.cross_reference_not_visible_for?(ext_issue.author)).to be_truthy

11
spec/requests/api/notes_spec.rb
View file

@ -13,20 +13,21 @@ describe API::API, api: true do
# For testing the cross-reference of a private issue in a public issue # For testing the cross-reference of a private issue in a public issue
let(:private_user) { create(:user) } let(:private_user) { create(:user) }
let(:private_project) { let(:private_project) do
create(:project, namespace: private_user.namespace). create(:project, namespace: private_user.namespace).
tap { |p| p.team << [private_user, :master] } tap { |p| p.team << [private_user, :master] }
} end
let(:private_issue) { create(:issue, project: private_project) } let(:private_issue) { create(:issue, project: private_project) }
let(:ext_proj) { create(:project, :public) } let(:ext_proj) { create(:project, :public) }
let(:ext_issue) { create(:issue, project: ext_proj) } let(:ext_issue) { create(:issue, project: ext_proj) }
let!(:cross_reference_note) { let!(:cross_reference_note) do
create :note, create :note,
noteable: ext_issue, project: ext_proj, noteable: ext_issue, project: ext_proj,
note: "mentioned in issue #{private_issue.to_reference(ext_proj)}", note: "mentioned in issue #{private_issue.to_reference(ext_proj)}",
system: true system: true
} end
before { project.team << [user, :reporter] } before { project.team << [user, :reporter] }