Commit 1b368161 authored by Robert Speicher's avatar Robert Speicher

Use `empty_project` where possible in spec/features/groups

parent 75319d97
...@@ -49,7 +49,7 @@ feature 'Edit group settings' do ...@@ -49,7 +49,7 @@ feature 'Edit group settings' do
end end
context 'with a project' do context 'with a project' do
given!(:project) { create(:project, group: group, path: 'project') } given!(:project) { create(:empty_project, group: group) }
given(:old_project_full_path) { "/#{group.path}/#{project.path}" } given(:old_project_full_path) { "/#{group.path}/#{project.path}" }
given(:new_project_full_path) { "/#{new_group_path}/#{project.path}" } given(:new_project_full_path) { "/#{new_group_path}/#{project.path}" }
...@@ -65,14 +65,14 @@ feature 'Edit group settings' do ...@@ -65,14 +65,14 @@ feature 'Edit group settings' do
update_path(new_group_path) update_path(new_group_path)
visit new_project_full_path visit new_project_full_path
expect(current_path).to eq(new_project_full_path) expect(current_path).to eq(new_project_full_path)
expect(find('h1.project-title')).to have_content(project.name) expect(find('h1.title')).to have_content(project.path)
end end
scenario 'the old project path redirects to the new path' do scenario 'the old project path redirects to the new path' do
update_path(new_group_path) update_path(new_group_path)
visit old_project_full_path visit old_project_full_path
expect(current_path).to eq(new_project_full_path) expect(current_path).to eq(new_project_full_path)
expect(find('h1.project-title')).to have_content(project.name) expect(find('h1.title')).to have_content(project.path)
end end
end end
end end
......
...@@ -4,7 +4,7 @@ feature 'Groups > Members > Request access' do ...@@ -4,7 +4,7 @@ feature 'Groups > Members > Request access' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:owner) { create(:user) } let(:owner) { create(:user) }
let(:group) { create(:group, :public, :access_requestable) } let(:group) { create(:group, :public, :access_requestable) }
let!(:project) { create(:project, :private, namespace: group) } let!(:project) { create(:empty_project, :private, namespace: group) }
background do background do
group.add_owner(owner) group.add_owner(owner)
......
...@@ -7,7 +7,7 @@ feature 'Group merge requests page' do ...@@ -7,7 +7,7 @@ feature 'Group merge requests page' do
include_examples 'project features apply to issuables', MergeRequest include_examples 'project features apply to issuables', MergeRequest
context 'archived issuable' do context 'archived issuable' do
let(:project_archived) { create(:project, :archived, :merge_requests_enabled, group: group) } let(:project_archived) { create(:project, :archived, :merge_requests_enabled, :repository, group: group) }
let(:issuable_archived) { create(:merge_request, source_project: project_archived, target_project: project_archived, title: 'issuable of an archived project') } let(:issuable_archived) { create(:merge_request, source_project: project_archived, target_project: project_archived, title: 'issuable of an archived project') }
let(:access_level) { ProjectFeature::ENABLED } let(:access_level) { ProjectFeature::ENABLED }
let(:user) { user_in_group } let(:user) { user_in_group }
......
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