Skip to content
Snippets Groups Projects
Commit 0bc1dfb6 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'rs-empty_project-cleanup' into 'master'

Ensure all project factories use `:repository` trait or `:empty_project`

See merge request !13238
parents c73f0c48 9513bd18
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 18 deletions
Loading
Loading
@@ -2,9 +2,9 @@ require 'spec_helper'
 
describe Labels::CreateService do
describe '#execute' do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let(:group) { create(:group) }
let(:hex_color) { '#FF0000' }
let(:named_color) { 'red' }
let(:upcase_color) { 'RED' }
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ require 'spec_helper'
 
describe Labels::UpdateService do
describe '#execute' do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
 
let(:hex_color) { '#FF0000' }
let(:named_color) { 'red' }
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ require 'spec_helper'
 
describe Milestones::DestroyService do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let(:milestone) { create(:milestone, title: 'Milestone v1.0', project: project) }
let(:issue) { create(:issue, project: project, milestone: milestone) }
let(:merge_request) { create(:merge_request, source_project: project, milestone: milestone) }
Loading
Loading
Loading
Loading
@@ -40,7 +40,7 @@ describe Users::DestroyService do
end
 
context "a deleted user's issues" do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
 
before do
project.add_developer(user)
Loading
Loading
@@ -66,7 +66,7 @@ describe Users::DestroyService do
end
 
context "a deleted user's merge_requests" do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
 
before do
project.add_developer(user)
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ require 'spec_helper'
 
describe Users::MigrateToGhostUserService do
let!(:user) { create(:user) }
let!(:project) { create(:project) }
let!(:project) { create(:project, :repository) }
let(:service) { described_class.new(user) }
 
context "migrating a user's associated records to the ghost user" do
Loading
Loading
Loading
Loading
@@ -5,7 +5,14 @@ shared_examples 'issuable record that supports quick actions in its description
include QuickActionsHelpers
 
let(:master) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) do
case issuable_type
when :merge_request
create(:project, :public, :repository)
when :issue
create(:empty_project, :public)
end
end
let!(:milestone) { create(:milestone, project: project, title: 'ASAP') }
let!(:label_bug) { create(:label, project: project, title: 'bug') }
let!(:label_feature) { create(:label, project: project, title: 'feature') }
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ module ExportFileHelper
ObjectWithParent = Struct.new(:object, :parent, :key_found)
 
def setup_project
project = create(:project, :public)
project = create(:project, :public, :repository)
 
create(:release, project: project)
 
Loading
Loading
Loading
Loading
@@ -3,7 +3,14 @@ require "spec_helper"
shared_examples "migrating a deleted user's associated records to the ghost user" do |record_class, fields|
record_class_name = record_class.to_s.titleize.downcase
 
let(:project) { create(:project) }
let(:project) do
case record_class
when MergeRequest
create(:project, :repository)
else
create(:empty_project)
end
end
 
before do
project.add_developer(user)
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@ describe FileUploader do
 
describe '.absolute_path' do
it 'returns the correct absolute path by building it dynamically' do
project = build_stubbed(:project)
project = build_stubbed(:empty_project)
upload = double(model: project, path: 'secret/foo.jpg')
 
dynamic_segment = project.path_with_namespace
Loading
Loading
Loading
Loading
@@ -28,7 +28,7 @@ describe DynamicPathValidator do
describe '#path_valid_for_record?' do
context 'for project' do
it 'calls valid_project_path?' do
project = build(:project, path: 'activity')
project = build(:empty_project, path: 'activity')
 
expect(described_class).to receive(:valid_project_path?).with(project.full_path).and_call_original
 
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@ describe 'layouts/nav/_project' do
before do
stub_container_registry_config(enabled: true)
 
assign(:project, create(:project))
assign(:project, create(:project, :repository))
allow(view).to receive(:current_ref).and_return('master')
 
allow(view).to receive(:can?).and_return(true)
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@ describe 'notify/pipeline_failed_email.html.haml' do
include Devise::Test::ControllerHelpers
 
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, :simple, source_project: project) }
 
let(:pipeline) do
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@ describe 'notify/pipeline_success_email.html.haml' do
include Devise::Test::ControllerHelpers
 
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, :simple, source_project: project) }
 
let(:pipeline) do
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@ describe CreateGpgSignatureWorker do
context 'when GpgKey is found' do
it 'calls Commit#signature' do
commit_sha = '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
project = create :project
project = create :empty_project
commit = instance_double(Commit)
 
allow(Project).to receive(:find_by).with(id: project.id).and_return(project)
Loading
Loading
@@ -18,7 +18,7 @@ describe CreateGpgSignatureWorker do
 
context 'when Commit is not found' do
let(:nonexisting_commit_sha) { 'bogus' }
let(:project) { create :project }
let(:project) { create :empty_project }
 
it 'does not raise errors' do
expect { described_class.new.perform(nonexisting_commit_sha, project.id) }.not_to raise_error
Loading
Loading
Loading
Loading
@@ -33,7 +33,7 @@ describe ProcessCommitWorker do
end
 
context 'when commit already exists in upstream project' do
let(:forked) { create(:project, :public) }
let(:forked) { create(:project, :public, :repository) }
 
it 'does not process commit message' do
create(:forked_project_link, forked_to_project: forked, forked_from_project: project)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment