Commit 1a77ea20 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'fix-part-of-44990' into 'master'

Fix RSpec/FactoriesInMigrationSpecs in two files

See merge request gitlab-org/gitlab-ce!24405
parents e9a4f2dd 833000ca
...@@ -3,9 +3,11 @@ require Rails.root.join('db', 'migrate', '20180201110056_add_foreign_keys_to_tod ...@@ -3,9 +3,11 @@ require Rails.root.join('db', 'migrate', '20180201110056_add_foreign_keys_to_tod
describe AddForeignKeysToTodos, :migration do describe AddForeignKeysToTodos, :migration do
let(:todos) { table(:todos) } let(:todos) { table(:todos) }
let(:users) { table(:users) }
let(:projects) { table(:projects) }
let(:project) { create(:project) } # rubocop:disable RSpec/FactoriesInMigrationSpecs let(:project) { projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1) }
let(:user) { create(:user) } # rubocop:disable RSpec/FactoriesInMigrationSpecs let(:user) { users.create!(email: 'email@email.com', name: 'foo', username: 'foo', projects_limit: 0) }
context 'add foreign key on user_id' do context 'add foreign key on user_id' do
let!(:todo_with_user) { create_todo(user_id: user.id) } let!(:todo_with_user) { create_todo(user_id: user.id) }
......
...@@ -2,6 +2,8 @@ require 'spec_helper' ...@@ -2,6 +2,8 @@ require 'spec_helper'
require Rails.root.join('db', 'post_migrate', '20170502101023_cleanup_namespaceless_pending_delete_projects.rb') require Rails.root.join('db', 'post_migrate', '20170502101023_cleanup_namespaceless_pending_delete_projects.rb')
describe CleanupNamespacelessPendingDeleteProjects, :migration, schema: 20180222043024 do describe CleanupNamespacelessPendingDeleteProjects, :migration, schema: 20180222043024 do
let(:projects) { table(:projects) }
before do before do
# Stub after_save callbacks that will fail when Project has no namespace # Stub after_save callbacks that will fail when Project has no namespace
allow_any_instance_of(Project).to receive(:ensure_storage_path_exists).and_return(nil) allow_any_instance_of(Project).to receive(:ensure_storage_path_exists).and_return(nil)
...@@ -10,9 +12,9 @@ describe CleanupNamespacelessPendingDeleteProjects, :migration, schema: 20180222 ...@@ -10,9 +12,9 @@ describe CleanupNamespacelessPendingDeleteProjects, :migration, schema: 20180222
describe '#up' do describe '#up' do
it 'only cleans up pending delete projects' do it 'only cleans up pending delete projects' do
create(:project) # rubocop:disable RSpec/FactoriesInMigrationSpecs projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1)
create(:project, pending_delete: true) # rubocop:disable RSpec/FactoriesInMigrationSpecs projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ee', namespace_id: 2, pending_delete: true)
project = build(:project, pending_delete: true, namespace_id: nil) # rubocop:disable RSpec/FactoriesInMigrationSpecs project = Project.new(pending_delete: true, namespace_id: nil)
project.save(validate: false) project.save(validate: false)
expect(NamespacelessProjectDestroyWorker).to receive(:bulk_perform_async).with([[project.id]]) expect(NamespacelessProjectDestroyWorker).to receive(:bulk_perform_async).with([[project.id]])
...@@ -21,8 +23,8 @@ describe CleanupNamespacelessPendingDeleteProjects, :migration, schema: 20180222 ...@@ -21,8 +23,8 @@ describe CleanupNamespacelessPendingDeleteProjects, :migration, schema: 20180222
end end
it 'does nothing when no pending delete projects without namespace found' do it 'does nothing when no pending delete projects without namespace found' do
create(:project) # rubocop:disable RSpec/FactoriesInMigrationSpecs projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1)
create(:project, pending_delete: true) # rubocop:disable RSpec/FactoriesInMigrationSpecs projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ee', namespace_id: 2, pending_delete: true)
expect(NamespacelessProjectDestroyWorker).not_to receive(:bulk_perform_async) expect(NamespacelessProjectDestroyWorker).not_to receive(:bulk_perform_async)
......
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