Commit 56123f9e authored by Mayra Cabrera's avatar Mayra Cabrera

Resolve conflict on spec/models/namespace_spec

parent dd989f2e
...@@ -691,7 +691,6 @@ describe Namespace do ...@@ -691,7 +691,6 @@ describe Namespace do
end end
end end
<<<<<<< HEAD
describe '#root_ancestor' do describe '#root_ancestor' do
it 'returns the top most ancestor', :nested_groups do it 'returns the top most ancestor', :nested_groups do
root_group = create(:group) root_group = create(:group)
...@@ -712,15 +711,6 @@ describe Namespace do ...@@ -712,15 +711,6 @@ describe Namespace do
let(:legacy_export) { legacy_project.export_project_path } let(:legacy_export) { legacy_project.export_project_path }
let(:hashed_export) { hashed_project.export_project_path } let(:hashed_export) { hashed_project.export_project_path }
=======
describe '#remove_exports' do
let(:legacy_project) { create(:project, :with_export, namespace: namespace) }
let(:hashed_project) { create(:project, :with_export, :hashed, namespace: namespace) }
let(:export_path) { Dir.mktmpdir('namespace_remove_exports_spec') }
let(:legacy_export) { legacy_project.export_project_path }
let(:hashed_export) { hashed_project.export_project_path }
>>>>>>> upstream/master
it 'removes exports for legacy and hashed projects' do it 'removes exports for legacy and hashed projects' do
allow(Gitlab::ImportExport).to receive(:storage_path) { export_path } allow(Gitlab::ImportExport).to receive(:storage_path) { export_path }
...@@ -745,17 +735,10 @@ describe Namespace do ...@@ -745,17 +735,10 @@ describe Namespace do
context 'when a parent is assigned to a group with no previous parent' do context 'when a parent is assigned to a group with no previous parent' do
it 'should return the path was' do it 'should return the path was' do
group = create(:group, parent: nil) group = create(:group, parent: nil)
<<<<<<< HEAD
parent = create(:group)
group.parent = parent
=======
parent = create(:group) parent = create(:group)
group.parent = parent group.parent = parent
>>>>>>> upstream/master
expect(group.full_path_was).to eq("#{group.path_was}") expect(group.full_path_was).to eq("#{group.path_was}")
end end
end end
......
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