Commit 30365b88 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'use-string-in-describe' into 'master'

Prefer string for describe as of:

https://gitlab.com/gitlab-org/gitlab-ce/blob/b7ba5fa06bfb434c9227a2175f936fc31fd3444f/doc/development/gotchas.md#dont-describe-symbols

See merge request !5202
parents fd382a55 115a57c2
...@@ -296,7 +296,7 @@ describe Project, models: true do ...@@ -296,7 +296,7 @@ describe Project, models: true do
end end
end end
describe :update_merge_requests do describe '#update_merge_requests' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:key) { create(:key, user_id: project.owner.id) } let(:key) { create(:key, user_id: project.owner.id) }
...@@ -345,7 +345,7 @@ describe Project, models: true do ...@@ -345,7 +345,7 @@ describe Project, models: true do
end end
end end
describe :to_param do describe '#to_param' do
context 'with namespace' do context 'with namespace' do
before do before do
@group = create :group, name: 'gitlab' @group = create :group, name: 'gitlab'
...@@ -356,7 +356,7 @@ describe Project, models: true do ...@@ -356,7 +356,7 @@ describe Project, models: true do
end end
end end
describe :repository do describe '#repository' do
let(:project) { create(:project) } let(:project) { create(:project) }
it 'should return valid repo' do it 'should return valid repo' do
...@@ -364,7 +364,7 @@ describe Project, models: true do ...@@ -364,7 +364,7 @@ describe Project, models: true do
end end
end end
describe :default_issues_tracker? do describe '#default_issues_tracker?' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:ext_project) { create(:redmine_project) } let(:ext_project) { create(:redmine_project) }
...@@ -377,7 +377,7 @@ describe Project, models: true do ...@@ -377,7 +377,7 @@ describe Project, models: true do
end end
end end
describe :external_issue_tracker do describe '#external_issue_tracker' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:ext_project) { create(:redmine_project) } let(:ext_project) { create(:redmine_project) }
...@@ -418,7 +418,7 @@ describe Project, models: true do ...@@ -418,7 +418,7 @@ describe Project, models: true do
end end
end end
describe :cache_has_external_issue_tracker do describe '#cache_has_external_issue_tracker' do
let(:project) { create(:project) } let(:project) { create(:project) }
it 'stores true if there is any external_issue_tracker' do it 'stores true if there is any external_issue_tracker' do
...@@ -440,7 +440,7 @@ describe Project, models: true do ...@@ -440,7 +440,7 @@ describe Project, models: true do
end end
end end
describe :open_branches do describe '#open_branches' do
let(:project) { create(:project) } let(:project) { create(:project) }
before do before do
...@@ -517,7 +517,7 @@ describe Project, models: true do ...@@ -517,7 +517,7 @@ describe Project, models: true do
end end
end end
describe :avatar_type do describe '#avatar_type' do
let(:project) { create(:project) } let(:project) { create(:project) }
it 'should be true if avatar is image' do it 'should be true if avatar is image' do
...@@ -531,7 +531,7 @@ describe Project, models: true do ...@@ -531,7 +531,7 @@ describe Project, models: true do
end end
end end
describe :avatar_url do describe '#avatar_url' do
subject { project.avatar_url } subject { project.avatar_url }
let(:project) { create(:project) } let(:project) { create(:project) }
...@@ -568,7 +568,7 @@ describe Project, models: true do ...@@ -568,7 +568,7 @@ describe Project, models: true do
end end
end end
describe :pipeline do describe '#pipeline' do
let(:project) { create :project } let(:project) { create :project }
let(:pipeline) { create :ci_pipeline, project: project, ref: 'master' } let(:pipeline) { create :ci_pipeline, project: project, ref: 'master' }
...@@ -588,7 +588,7 @@ describe Project, models: true do ...@@ -588,7 +588,7 @@ describe Project, models: true do
end end
end end
describe :builds_enabled do describe '#builds_enabled' do
let(:project) { create :project } let(:project) { create :project }
before { project.builds_enabled = true } before { project.builds_enabled = true }
...@@ -690,7 +690,7 @@ describe Project, models: true do ...@@ -690,7 +690,7 @@ describe Project, models: true do
end end
end end
describe :any_runners do describe '#any_runners' do
let(:project) { create(:empty_project, shared_runners_enabled: shared_runners_enabled) } let(:project) { create(:empty_project, shared_runners_enabled: shared_runners_enabled) }
let(:specific_runner) { create(:ci_runner) } let(:specific_runner) { create(:ci_runner) }
let(:shared_runner) { create(:ci_runner, :shared) } let(:shared_runner) { create(:ci_runner, :shared) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment