Skip to content

G
gitlab-ce
Commit c3b1ac85 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Merge branch 'rs-empty_project-features-ee' into 'master' 

[EE] Use `:empty_project` where possible in feature specs

See merge request !2546
parents 677802c2 2fe6cb5e
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 213 deletions
spec/features/admin/admin_hook_logs_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Admin::HookLogs' do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let(:system_hook) { create(:system_hook) }
let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') }
......
spec/features/admin/admin_hooks_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Admin::Hooks' do
before do
@project = create(:project)
@project = create(:empty_project)
sign_in(create(:admin))
@system_hook = create(:system_hook)
......
spec/features/admin/admin_projects_spec.rb
View file @ c3b1ac85
......@@ -4,17 +4,18 @@ describe "Admin::Projects" do
include Select2Helper
let(:user) { create :user }
let!(:project) { create(:project) }
let!(:current_user) { create(:admin) }
let(:project) { create(:empty_project) }
let(:current_user) { create(:admin) }
before do
sign_in(current_user)
end
describe "GET /admin/projects" do
let!(:archived_project) { create :project, :public, :archived }
let!(:archived_project) { create :empty_project, :public, :archived }
before do
expect(project).to be_persisted
visit admin_projects_path
end
......@@ -39,15 +40,14 @@ describe "Admin::Projects" do
describe "GET /admin/projects/:namespace_id/:id" do
before do
visit admin_projects_path
click_link "#{project.name}"
end
expect(project).to be_persisted
it do
expect(current_path).to eq admin_project_path(project)
visit admin_projects_path
click_link project.name
end
it "has project info" do
expect(current_path).to eq admin_project_path(project)
expect(page).to have_content(project.path)
expect(page).to have_content(project.name)
expect(page).to have_content(project.name_with_namespace)
......@@ -56,6 +56,9 @@ describe "Admin::Projects" do
end
describe 'transfer project' do
# The gitlab-shell transfer will fail for a project without a repository
let(:project) { create(:project, :repository) }
before do
create(:group, name: 'Web')
......
spec/features/admin/admin_users_spec.rb
View file @ c3b1ac85
......@@ -319,7 +319,7 @@ describe "Admin::Users" do
describe "GET /admin/users/:id/projects" do
let(:group) { create(:group) }
let!(:project) { create(:project, group: group) }
let!(:project) { create(:empty_project, group: group) }
before do
group.add_developer(user)
......
spec/features/atom/dashboard_issues_spec.rb
View file @ c3b1ac85
......@@ -4,8 +4,8 @@ describe "Dashboard Issues Feed" do
describe "GET /issues" do
let!(:user) { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
let!(:project1) { create(:project) }
let!(:project2) { create(:project) }
let!(:project1) { create(:empty_project) }
let!(:project2) { create(:empty_project) }
before do
project1.team << [user, :master]
......
spec/features/atom/dashboard_spec.rb
View file @ c3b1ac85
......@@ -19,7 +19,7 @@ describe "Dashboard Feed" do
end
context 'feed content' do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let(:issue) { create(:issue, project: project, author: user, description: '') }
let(:note) { create(:note, noteable: issue, author: user, note: 'Bug confirmed', project: project) }
......
spec/features/atom/issues_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ describe 'Issues Feed' do
let!(:user) { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
let!(:group) { create(:group) }
let!(:project) { create(:project) }
let!(:project) { create(:empty_project) }
let!(:issue) { create(:issue, author: user, assignees: [assignee], project: project) }
before do
......
spec/features/atom/users_spec.rb
View file @ c3b1ac85
......@@ -19,7 +19,7 @@ describe "User Feed" do
end
context 'feed content' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:issue) do
create(:issue,
project: project,
......
spec/features/dashboard/archived_projects_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
RSpec.describe 'Dashboard Archived Project' do
let(:user) { create :user }
let(:project) { create :project}
let(:archived_project) { create(:project, :archived) }
let(:archived_project) { create(:empty_project, :archived) }
before do
project.team << [user, :master]
......
spec/features/dashboard/datetime_on_tooltips_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Tooltips on .timeago dates', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, name: 'test', namespace: user.namespace) }
let(:project) { create(:empty_project, name: 'test', namespace: user.namespace) }
let(:created_date) { Date.yesterday.to_time }
let(:expected_format) { created_date.in_time_zone.strftime('%b %-d, %Y %l:%M%P') }
......
spec/features/dashboard/label_filter_spec.rb
View file @ c3b1ac85
......@@ -2,8 +2,8 @@ require 'spec_helper'
describe 'Dashboard > label filter', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, name: 'test', namespace: user.namespace) }
let(:project2) { create(:project, name: 'test2', path: 'test2', namespace: user.namespace) }
let(:project) { create(:empty_project, name: 'test', namespace: user.namespace) }
let(:project2) { create(:empty_project, name: 'test2', path: 'test2', namespace: user.namespace) }
let(:label) { create(:label, title: 'bug', color: '#ff0000') }
let(:label2) { create(:label, title: 'bug') }
......
spec/features/dashboard/milestone_filter_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Dashboard > milestone filter', :js do
include FilterItemSelectHelper
let(:user) { create(:user) }
let(:project) { create(:project, name: 'test', namespace: user.namespace) }
let(:project) { create(:empty_project, name: 'test', namespace: user.namespace) }
let(:milestone) { create(:milestone, title: 'v1.0', project: project) }
let(:milestone2) { create(:milestone, title: 'v2.0', project: project) }
let!(:issue) { create :issue, author: user, project: project, milestone: milestone }
......
spec/features/dashboard/todos/target_state_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'Dashboard > Todo target states' do
let(:user) { create(:user) }
let(:author) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
before do
sign_in(user)
......
spec/features/dashboard/todos/todos_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Dashboard Todos' do
let(:user) { create(:user) }
let(:author) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:issue) { create(:issue, due_date: Date.today) }
context 'User does not have todos' do
......@@ -212,7 +212,7 @@ feature 'Dashboard Todos' do
note1 = create(:note_on_issue, note: "Hello #{label1.to_reference(format: :name)}", noteable_id: issue.id, noteable_type: 'Issue', project: issue.project)
create(:todo, :mentioned, project: project, target: issue, user: user, note_id: note1.id)
project2 = create(:project, :public)
project2 = create(:empty_project, :public)
label2 = create(:label, project: project2)
issue2 = create(:issue, project: project2)
note2 = create(:note_on_issue, note: "Test #{label2.to_reference(format: :name)}", noteable_id: issue2.id, noteable_type: 'Issue', project: project2)
......
spec/features/dashboard/user_filters_projects_spec.rb
View file @ c3b1ac85
......@@ -2,9 +2,9 @@ require 'spec_helper'
describe 'Dashboard > User filters projects' do
let(:user) { create(:user) }
let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace) }
let(:project) { create(:empty_project, name: 'Victorialand', namespace: user.namespace) }
let(:user2) { create(:user) }
let(:project2) { create(:project, name: 'Treasure', namespace: user2.namespace) }
let(:project2) { create(:empty_project, name: 'Treasure', namespace: user2.namespace) }
before do
project.team << [user, :master]
......
spec/features/explore/new_menu_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Top Plus Menu', :js do
let(:user) { create(:user) }
let(:group) { create(:group) }
let(:project) { create(:project, :repository, creator: user, namespace: user.namespace) }
let(:public_project) { create(:project, :public) }
let(:public_project) { create(:empty_project, :public) }
before do
group.add_owner(user)
......
spec/features/groups/group_settings_spec.rb
View file @ c3b1ac85
......@@ -49,7 +49,7 @@ feature 'Edit group settings' do
end
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(:new_project_full_path) { "/#{new_group_path}/#{project.path}" }
......@@ -65,14 +65,14 @@ feature 'Edit group settings' do
update_path(new_group_path)
visit 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
scenario 'the old project path redirects to the new path' do
update_path(new_group_path)
visit old_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
......
spec/features/groups/members/request_access_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Groups > Members > Request access' do
let(:user) { create(:user) }
let(:owner) { create(:user) }
let(:group) { create(:group, :public, :access_requestable) }
let!(:project) { create(:project, :private, namespace: group) }
let!(:project) { create(:empty_project, :private, namespace: group) }
background do
group.add_owner(owner)
......
spec/features/groups/merge_requests_spec.rb
View file @ c3b1ac85
......@@ -7,7 +7,7 @@ feature 'Group merge requests page' do
include_examples 'project features apply to issuables', MergeRequest
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(:access_level) { ProjectFeature::ENABLED }
let(:user) { user_in_group }
......
spec/features/issuables/close_reopen_report_toggle_spec.rb
View file @ c3b1ac85
......@@ -79,7 +79,7 @@ describe 'Issuables Close/Reopen/Report toggle' do
end
context 'on a merge request' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:issuable) { create(:merge_request, source_project: project) }
before do
......@@ -96,7 +96,7 @@ describe 'Issuables Close/Reopen/Report toggle' do
end
context 'when user doesnt have permission to update' do
let(:cant_project) { create(:project) }
let(:cant_project) { create(:project, :repository) }
let(:cant_issuable) { create(:merge_request, source_project: cant_project) }
before do
......
spec/features/issuables/user_sees_sidebar_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'rails_helper'
describe 'Issue Sidebar on Mobile' do
include MobileHelpers
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
let(:issue) { create(:issue, project: project) }
let!(:user) { create(:user)}
......
spec/features/issues/award_emoji_spec.rb
View file @ c3b1ac85
require 'rails_helper'
describe 'Awards Emoji' do
let!(:project) { create(:project, :public) }
let!(:project) { create(:empty_project, :public) }
let!(:user) { create(:user) }
let(:issue) do
create(:issue,
......
spec/features/issues/award_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Issue awards', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:issue) { create(:issue, project: project) }
describe 'logged in' do
......
spec/features/issues/bulk_assignment_labels_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Issues > Labels bulk assignment' do
let(:user) { create(:user) }
let!(:project) { create(:project) }
let!(:project) { create(:empty_project) }
let!(:issue1) { create(:issue, project: project, title: "Issue 1") }
let!(:issue2) { create(:issue, project: project, title: "Issue 2") }
let!(:bug) { create(:label, project: project, title: 'bug') }
......
spec/features/issues/create_branch_merge_request_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Create Branch/Merge Request Dropdown on issue page', js: true do
let(:user) { create(:user) }
let!(:project) { create(:project) }
let!(:project) { create(:project, :repository) }
let(:issue) { create(:issue, project: project, title: 'Cherry-Coloured Funk') }
context 'for team members' do
......
spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Resolving all open discussions in a merge request from an issue', js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
......
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Resolve an open discussion in a merge request by creating an issue' do
let(:user) { create(:user) }
let(:project) { create(:project, only_allow_merge_if_all_discussions_are_resolved: true) }
let(:project) { create(:project, :repository, only_allow_merge_if_all_discussions_are_resolved: true) }
let(:merge_request) { create(:merge_request, source_project: project) }
let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
......
spec/features/issues/filtered_search/filter_issues_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ describe 'Filter issues', js: true do
include FilteredSearchHelpers
let!(:group) { create(:group) }
let!(:project) { create(:project, group: group) }
let!(:project) { create(:empty_project, group: group) }
let!(:user) { create(:user, username: 'joe', name: 'Joe') }
let!(:user2) { create(:user, username: 'jane') }
let!(:label) { create(:label, project: project) }
......
spec/features/issues/form_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'New/edit issue', :js do
include ActionView::Helpers::JavaScriptHelper
include FormHelper
let!(:project) { create(:project) }
let!(:project) { create(:empty_project) }
let!(:user) { create(:user)}
let!(:user2) { create(:user)}
let!(:milestone) { create(:milestone, project: project) }
......
spec/features/issues/gfm_autocomplete_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'GFM autocomplete', js: true do
let(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') }
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let(:label) { create(:label, project: project, title: 'special+') }
let(:issue) { create(:issue, project: project) }
......
spec/features/issues/issue_detail_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Issue Detail', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:issue) { create(:issue, project: project, author: user) }
context 'when user displays the issue' do
......
spec/features/issues/issue_sidebar_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Issue Sidebar' do
include MobileHelpers
let(:group) { create(:group, :nested) }
let(:project) { create(:project, :public, namespace: group) }
let(:project) { create(:empty_project, :public, namespace: group) }
let(:issue) { create(:issue, project: project) }
let!(:user) { create(:user)}
let!(:label) { create(:label, project: project, title: 'bug') }
......
spec/features/issues/markdown_toolbar_spec.rb
View file @ c3b1ac85
require 'rails_helper'
feature 'Issue markdown toolbar', js: true do
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:issue) { create(:issue, project: project) }
let(:user) { create(:user) }
let(:user) { create(:user) }
before do
sign_in(user)
......
spec/features/issues/move_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'issue move to another project' do
let(:user) { create(:user) }
let(:old_project) { create(:project) }
let(:old_project) { create(:project, :repository) }
let(:text) { 'Some issue description' }
let(:issue) do
......@@ -25,8 +25,8 @@ feature 'issue move to another project' do
context 'user has permission to move issue' do
let!(:mr) { create(:merge_request, source_project: old_project) }
let(:new_project) { create(:project) }
let(:new_project_search) { create(:project) }
let(:new_project) { create(:empty_project) }
let(:new_project_search) { create(:empty_project) }
let(:text) { "Text with #{mr.to_reference}" }
let(:cross_reference) { old_project.to_reference(new_project) }
......@@ -63,8 +63,8 @@ feature 'issue move to another project' do
end
context 'user does not have permission to move the issue to a project', js: true do
let!(:private_project) { create(:project, :private) }
let(:another_project) { create(:project) }
let!(:private_project) { create(:empty_project, :private) }
let(:another_project) { create(:empty_project) }
background { another_project.team << [user, :guest] }
scenario 'browsing projects in projects select' do
......
spec/features/issues/notes_on_issues_spec.rb
View file @ c3b1ac85
......@@ -35,42 +35,42 @@ describe 'Create notes on issues', :js do
context 'mentioning issue on a private project' do
it_behaves_like 'notes with reference' do
let(:project) { create(:project, :private) }
let(:project) { create(:empty_project, :private) }
let(:mention) { create(:issue, project: project) }
end
end
context 'mentioning issue on an internal project' do
it_behaves_like 'notes with reference' do
let(:project) { create(:project, :internal) }
let(:project) { create(:empty_project, :internal) }
let(:mention) { create(:issue, project: project) }
end
end
context 'mentioning issue on a public project' do
it_behaves_like 'notes with reference' do
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:mention) { create(:issue, project: project) }
end
end
context 'mentioning merge request on a private project' do
it_behaves_like 'notes with reference' do
let(:project) { create(:project, :private) }
let(:project) { create(:project, :private, :repository) }
let(:mention) { create(:merge_request, source_project: project) }
end
end
context 'mentioning merge request on an internal project' do
it_behaves_like 'notes with reference' do
let(:project) { create(:project, :internal) }
let(:project) { create(:project, :internal, :repository) }
let(:mention) { create(:merge_request, source_project: project) }
end
end
context 'mentioning merge request on a public project' do
it_behaves_like 'notes with reference' do
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:mention) { create(:merge_request, source_project: project) }
end
end
......
spec/features/issues/spam_issues_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'rails_helper'
describe 'New issue', js: true do
include StubENV
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:user) { create(:user)}
before do
......
spec/features/issues/todo_spec.rb
View file @ c3b1ac85
require 'rails_helper'
feature 'Manually create a todo item from issue', js: true do
let!(:project) { create(:project) }
let!(:issue) { create(:issue, project: project) }
let!(:user) { create(:user)}
let!(:project) { create(:empty_project) }
let!(:issue) { create(:issue, project: project) }
let!(:user) { create(:user)}
before do
project.team << [user, :master]
......
spec/features/issues/update_issues_spec.rb
View file @ c3b1ac85
require 'rails_helper'
feature 'Multiple issue updating from issues#index', :js do
let!(:project) { create(:project) }
let!(:project) { create(:empty_project) }
let!(:issue) { create(:issue, project: project) }
let!(:user) { create(:user)}
......
spec/features/issues/user_uses_slash_commands_spec.rb
View file @ c3b1ac85
......@@ -9,7 +9,7 @@ feature 'Issues > User uses quick actions', js: true do
describe 'issue-only commands' do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
before do
project.team << [user, :master]
......
spec/features/merge_requests/assign_issues_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Merge request issue assignment', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:issue1) { create(:issue, project: project) }
let(:issue2) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, :simple, source_project: project, author: user, description: "fixes #{issue1.to_reference} and #{issue2.to_reference}") }
......
spec/features/merge_requests/award_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Merge request awards', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
describe 'logged in' do
......
spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Check if mergeable with unresolved discussions', js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let!(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) }
before do
......
spec/features/merge_requests/cherry_pick_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'Cherry-pick Merge Requests', js: true do
let(:user) { create(:user) }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
let(:project) { create(:project, :repository, namespace: group) }
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
before do
......
spec/features/merge_requests/closes_issues_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Merge Request closing issues message', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:issue_1) { create(:issue, project: project)}
let(:issue_2) { create(:issue, project: project)}
let(:merge_request) do
......
spec/features/merge_requests/conflicts_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Merge request conflict resolution', js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
before do
# In order to have the diffs collapsed, we need to disable the increase feature
......
spec/features/merge_requests/create_new_mr_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Create New Merge Request', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
before do
project.team << [user, :master]
......@@ -92,7 +92,7 @@ feature 'Create New Merge Request', js: true do
context 'when target project cannot be viewed by the current user' do
it 'does not leak the private project name & namespace' do
private_project = create(:project, :private)
private_project = create(:project, :private, :repository)
visit project_new_merge_request_path(project, merge_request: { target_project_id: private_project.id })
......@@ -103,7 +103,7 @@ feature 'Create New Merge Request', js: true do
context 'when source project cannot be viewed by the current user' do
it 'does not leak the private project name & namespace' do
private_project = create(:project, :private)
private_project = create(:project, :private, :repository)
visit project_new_merge_request_path(project, merge_request: { source_project_id: private_project.id })
......
spec/features/merge_requests/created_from_fork_spec.rb
View file @ c3b1ac85
......@@ -2,8 +2,8 @@ require 'spec_helper'
feature 'Merge request created from fork' do
given(:user) { create(:user) }
given(:project) { create(:project, :public) }
given(:fork_project) { create(:project, :public) }
given(:project) { create(:project, :public, :repository) }
given(:fork_project) { create(:project, :public, :repository) }
given!(:merge_request) do
create(:forked_project_link, forked_to_project: fork_project,
......
spec/features/merge_requests/diff_notes_avatars_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Diff note avatars', js: true do
include NoteInteractionHelpers
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: "Bug NS-04") }
let(:path) { "files/ruby/popen.rb" }
let(:position) do
......
spec/features/merge_requests/diff_notes_resolve_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Diff notes resolve', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: "Bug NS-04") }
let!(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) }
let(:path) { "files/ruby/popen.rb" }
......
spec/features/merge_requests/diffs_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Diffs URL', js: true do
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
context 'when visit with */* as accept header' do
......
spec/features/merge_requests/edit_mr_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Edit Merge Request' do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, :simple, source_project: project) }
context 'editing a MR' do
......
spec/features/merge_requests/filter_by_labels_spec.rb
View file @ c3b1ac85
require 'rails_helper'
feature 'Issue filtering by Labels', js: true do
feature 'Merge Request filtering by Labels', js: true do
include FilteredSearchHelpers
include MergeRequestHelpers
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let!(:user) { create(:user) }
let!(:label) { create(:label, project: project) }
......
spec/features/merge_requests/filter_by_milestone_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Merge Request filtering by Milestone' do
include FilteredSearchHelpers
include MergeRequestHelpers
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let!(:user) { create(:user)}
let(:milestone) { create(:milestone, project: project) }
......
spec/features/merge_requests/filter_merge_requests_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'Filter merge requests' do
include FilteredSearchHelpers
include MergeRequestHelpers
let!(:project) { create(:project) }
let!(:project) { create(:project, :repository) }
let!(:group) { create(:group) }
let!(:user) { create(:user) }
let!(:milestone) { create(:milestone, project: project) }
......
spec/features/merge_requests/form_spec.rb
View file @ c3b1ac85
require 'rails_helper'
describe 'New/edit merge request', :js do
let!(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
let(:fork_project) { create(:project, forked_from_project: project) }
let!(:user) { create(:user)}
let!(:user2) { create(:user)}
let!(:milestone) { create(:milestone, project: project) }
let!(:label) { create(:label, project: project) }
let!(:label2) { create(:label, project: project) }
let!(:project) { create(:project, :public, :repository) }
let(:fork_project) { create(:project, :repository, forked_from_project: project) }
let!(:user) { create(:user) }
let!(:user2) { create(:user) }
let!(:milestone) { create(:milestone, project: project) }
let!(:label) { create(:label, project: project) }
let!(:label2) { create(:label, project: project) }
before do
project.team << [user, :master]
......
spec/features/merge_requests/merge_commit_message_toggle_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Clicking toggle commit message link', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:issue_1) { create(:issue, project: project)}
let(:issue_2) { create(:issue, project: project)}
let(:merge_request) do
......
spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Merge immediately', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let!(:merge_request) do
create(:merge_request_with_diffs, source_project: project,
......
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Merge When Pipeline Succeeds', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) do
create(:merge_request_with_diffs, source_project: project,
......
spec/features/merge_requests/mini_pipeline_graph_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Mini Pipeline Graph', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, source_project: project, head_pipeline: pipeline) }
let(:pipeline) { create(:ci_empty_pipeline, project: project, ref: 'master', status: 'running', sha: project.commit.id) }
......
spec/features/merge_requests/reset_filters_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ feature 'Merge requests filter clear button', js: true do
include MergeRequestHelpers
include IssueHelpers
let!(:project) { create(:project, :public) }
let!(:project) { create(:project, :public, :repository) }
let!(:user) { create(:user) }
let!(:milestone) { create(:milestone, project: project) }
let!(:bug) { create(:label, project: project, name: 'bug')}
......
spec/features/merge_requests/toggler_behavior_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'toggler_behavior', js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, source_project: project, author: user) }
let(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
let(:fragment_id) { "#note_#{note.id}" }
......
spec/features/merge_requests/update_merge_requests_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Multiple merge requests updating from merge_requests#index' do
let!(:user) { create(:user)}
let!(:project) { create(:project) }
let!(:project) { create(:project, :repository) }
let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
before do
......
spec/features/merge_requests/user_lists_merge_requests_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'Projects > Merge requests > User lists merge requests' do
include MergeRequestHelpers
include SortingHelper
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:user) { create(:user) }
before do
......
spec/features/merge_requests/user_posts_notes_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'Merge requests > User posts notes', :js do
include NoteInteractionHelpers
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:merge_request) do
create(:merge_request, source_project: project, target_project: project)
end
......
spec/features/merge_requests/user_sees_system_notes_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Merge requests > User sees system notes' do
let(:public_project) { create(:project, :public) }
let(:private_project) { create(:project, :private) }
let(:public_project) { create(:project, :public, :repository) }
let(:private_project) { create(:project, :private, :repository) }
let(:issue) { create(:issue, project: private_project) }
let(:merge_request) { create(:merge_request, source_project: public_project, source_branch: 'markdown') }
let!(:note) { create(:note_on_merge_request, :system, noteable: merge_request, project: public_project, note: "mentioned in #{issue.to_reference(public_project)}") }
......
spec/features/merge_requests/user_uses_slash_commands_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
include QuickActionsHelpers
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
let!(:milestone) { create(:milestone, project: project, title: 'ASAP') }
......@@ -129,7 +129,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
end
describe '/target_branch command in merge request' do
let(:another_project) { create(:project, :public) }
let(:another_project) { create(:project, :public, :repository) }
let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
before do
......
spec/features/merge_requests/widget_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
describe 'Merge request', :js do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
before do
......@@ -223,7 +223,7 @@ describe 'Merge request', :js do
end
context 'user can merge into source project but cannot push to fork', js: true do
let(:fork_project) { create(:project, :public) }
let(:fork_project) { create(:project, :public, :repository) }
let(:user2) { create(:user) }
before do
......
spec/features/merge_requests/wip_message_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Work In Progress help message' do
let!(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
let!(:project) { create(:project, :public, :repository) }
let!(:user) { create(:user) }
before do
......
spec/features/profiles/account_spec.rb
View file @ c3b1ac85
......@@ -27,7 +27,7 @@ feature 'Profile > Account' do
end
context 'with a project' do
given!(:project) { create(:project, namespace: user.namespace, path: 'project') }
given!(:project) { create(:empty_project, namespace: user.namespace) }
given(:new_project_path) { "/#{new_username}/#{project.path}" }
given(:old_project_path) { "/#{user.username}/#{project.path}" }
......@@ -43,14 +43,14 @@ feature 'Profile > Account' do
update_username(new_username)
visit new_project_path
expect(current_path).to eq(new_project_path)
expect(find('h1.project-title')).to have_content(project.name)
expect(find('h1.title')).to have_content(project.path)
end
scenario 'the old project path redirects to the new path' do
update_username(new_username)
visit old_project_path
expect(current_path).to eq(new_project_path)
expect(find('h1.project-title')).to have_content(project.name)
expect(find('h1.title')).to have_content(project.path)
end
end
end
......
spec/features/projects/artifacts/browse_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Browse artifact', :js do
let(:project) { create(:project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.sha, ref: 'master') }
let(:project) { create(:empty_project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, project: project) }
let(:job) { create(:ci_build, :artifacts, pipeline: pipeline) }
def browse_path(path)
......
spec/features/projects/artifacts/download_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Download artifact', :js do
let(:project) { create(:project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, status: :success, project: project, sha: project.commit.sha, ref: 'master') }
let(:project) { create(:empty_project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, status: :success, project: project) }
let(:job) { create(:ci_build, :artifacts, :success, pipeline: pipeline) }
shared_examples 'downloading' do
......
spec/features/projects/artifacts/file_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Artifact file', :js do
let(:project) { create(:project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.sha, ref: 'master') }
let(:project) { create(:empty_project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, project: project) }
let(:build) { create(:ci_build, :artifacts, pipeline: pipeline) }
def visit_file(path)
......
spec/features/projects/artifacts/raw_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Raw artifact', :js do
let(:project) { create(:project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.sha, ref: 'master') }
let(:project) { create(:empty_project, :public) }
let(:pipeline) { create(:ci_empty_pipeline, project: project) }
let(:job) { create(:ci_build, :artifacts, pipeline: pipeline) }
def raw_path(path)
......
spec/features/projects/badges/coverage_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'test coverage badge' do
given!(:user) { create(:user) }
given!(:project) { create(:project, :private) }
given!(:project) { create(:empty_project, :private) }
context 'when user has access to view badge' do
background do
......@@ -55,7 +55,7 @@ feature 'test coverage badge' do
end
def create_pipeline
opts = { project: project, ref: 'master', sha: project.commit.id }
opts = { project: project }
create(:ci_pipeline, opts).tap do |pipeline|
yield pipeline
......
spec/features/projects/badges/list_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'list of badges' do
background do
user = create(:user)
project = create(:project)
project = create(:project, :repository)
project.team << [user, :master]
sign_in(user)
visit project_pipelines_settings_path(project)
......
spec/features/projects/blobs/blob_show_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'File blob', :js do
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
def visit_blob(path, anchor: nil, ref: 'master')
visit project_blob_path(project, File.join(ref, path), anchor: anchor)
......
spec/features/projects/branches/download_buttons_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Download buttons in branches page' do
given(:user) { create(:user) }
given(:role) { :developer }
given(:status) { 'success' }
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
given(:pipeline) do
create(:ci_pipeline,
......
spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'New Branch Ref Dropdown', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:toggle) { find('.create-from .dropdown-menu-toggle') }
before do
......
spec/features/projects/branches_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'Branches' do
include ProtectedBranchHelpers
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
let(:repository) { project.repository }
context 'logged in as developer' do
......
spec/features/projects/commit/builds_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'project commit pipelines', js: true do
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
background do
user = create(:user)
......
spec/features/projects/commit/cherry_pick_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'Cherry-pick Commits' do
let(:user) { create(:user) }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
let(:project) { create(:project, :repository, namespace: group) }
let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
let(:master_pickable_merge) { project.commit('e56497bb5f03a90a51293fc6d516788730953899') }
......
spec/features/projects/commit/mini_pipeline_graph_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Mini Pipeline Graph in Commit View', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
before do
sign_in(user)
......
spec/features/projects/compare_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require "spec_helper"
describe "Compare", js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
before do
project.team << [user, :master]
......
spec/features/projects/edit_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Project edit', js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
before do
project.team << [user, :master]
......@@ -35,7 +35,7 @@ feature 'Project edit', js: true do
end
context 'given project with merge_requests_disabled access level' do
let(:project) { create(:project, :merge_requests_disabled) }
let(:project) { create(:empty_project, :merge_requests_disabled) }
it 'hides merge requests section' do
expect(page).to have_selector('.merge-requests-feature', visible: false)
......@@ -51,7 +51,7 @@ feature 'Project edit', js: true do
end
context 'given project with builds_disabled access level' do
let(:project) { create(:project, :builds_disabled) }
let(:project) { create(:empty_project, :builds_disabled) }
it 'hides builds select section' do
expect(page).to have_selector('.builds-feature', visible: false)
......
spec/features/projects/environments/environment_spec.rb
View file @ c3b1ac85
......@@ -205,7 +205,7 @@ feature 'Environment' do
end
feature 'auto-close environment when branch is deleted' do
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
given!(:environment) do
create(:environment, :with_review_app, project: project,
......
spec/features/projects/environments/environments_spec.rb
View file @ c3b1ac85
......@@ -111,7 +111,7 @@ feature 'Environments page', :js do
end
context 'with deployments' do
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
given(:deployment) do
create(:deployment, environment: environment,
......
spec/features/projects/features_visibility_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Edit Project Settings' do
let(:member) { create(:user) }
let!(:project) { create(:project, :public, path: 'gitlab', name: 'sample') }
let!(:project) { create(:project, :public, :repository) }
let!(:issue) { create(:issue, project: project) }
let(:non_member) { create(:user) }
......@@ -249,7 +249,7 @@ describe 'Edit Project Settings' do
# Regression spec for https://gitlab.com/gitlab-org/gitlab-ce/issues/24056
describe 'project statistic visibility' do
let!(:project) { create(:project, :private) }
let!(:project) { create(:empty_project, :private) }
before do
project.team << [member, :guest]
......
spec/features/projects/files/browse_files_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'user browses project', js: true do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
before do
......
spec/features/projects/files/creating_a_file_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'User wants to create a file' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
background do
......
spec/features/projects/files/dockerfile_dropdown_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ require 'fileutils'
feature 'User wants to add a Dockerfile file' do
before do
user = create(:user)
project = create(:project)
project = create(:project, :repository)
project.team << [user, :master]
sign_in user
......
spec/features/projects/files/download_buttons_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Download buttons in files tree' do
given(:user) { create(:user) }
given(:role) { :developer }
given(:status) { 'success' }
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
given(:pipeline) do
create(:ci_pipeline,
......
spec/features/projects/files/edit_file_soft_wrap_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'User uses soft wrap whilst editing file', js: true do
before do
user = create(:user)
project = create(:project)
project = create(:project, :repository)
project.team << [user, :master]
sign_in user
visit project_new_blob_path(project, 'master', file_name: 'test_file-name')
......
spec/features/projects/files/editing_a_file_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'User wants to edit a file' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
let(:commit_params) do
{
......
spec/features/projects/files/find_file_keyboard_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Find file keyboard shortcuts', js: true do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
before do
project.team << [user, :master]
......
spec/features/projects/files/find_files_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Find files button in the tree header' do
given(:user) { create(:user) }
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
background do
sign_in(user)
......
spec/features/projects/files/gitignore_dropdown_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'User wants to add a .gitignore file' do
before do
user = create(:user)
project = create(:project)
project = create(:project, :repository)
project.team << [user, :master]
sign_in user
visit project_new_blob_path(project, 'master', file_name: '.gitignore')
......
spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'User wants to add a .gitlab-ci.yml file' do
before do
user = create(:user)
project = create(:project)
project = create(:project, :repository)
project.team << [user, :master]
sign_in user
visit project_new_blob_path(project, 'master', file_name: '.gitlab-ci.yml')
......
spec/features/projects/files/project_owner_creates_license_file_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'project owner creates a license file', js: true do
let(:project_master) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
background do
project.repository.delete_file(project_master, 'LICENSE',
message: 'Remove LICENSE', branch_name: 'master')
......
spec/features/projects/files/template_type_dropdown_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Template type dropdown selector', js: true do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
before do
......
spec/features/projects/files/undo_template_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Template Undo Button', js: true do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
before do
......
spec/features/projects/gfm_autocomplete_load_spec.rb
View file @ c3b1ac85
require 'spec_helper'
describe 'GFM autocomplete loading', js: true do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
before do
sign_in(create(:admin))
......
spec/features/projects/group_links_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Project group links', :js do
include Select2Helper
let(:master) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let!(:group) { create(:group) }
background do
......@@ -35,7 +35,7 @@ feature 'Project group links', :js do
context 'nested group project' do
let!(:nested_group) { create(:group, parent: group) }
let!(:another_group) { create(:group) }
let!(:project) { create(:project, namespace: nested_group) }
let!(:project) { create(:empty_project, namespace: nested_group) }
background do
group.add_master(master)
......
spec/features/projects/import_export/import_file_spec.rb
View file @ c3b1ac85
......@@ -46,7 +46,7 @@ feature 'Import/Export - project import integration test', js: true do
end
scenario 'invalid project' do
project = create(:project, namespace: namespace)
project = create(:empty_project, namespace: namespace)
visit new_project_path
......@@ -62,7 +62,7 @@ feature 'Import/Export - project import integration test', js: true do
end
scenario 'project with no name' do
create(:project, namespace: namespace)
create(:empty_project, namespace: namespace)
visit new_project_path
......
spec/features/projects/issuable_templates_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'issuable templates', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
before do
project.team << [user, :master]
......@@ -120,7 +120,7 @@ feature 'issuable templates', js: true do
context 'user creates a merge request from a forked project using templates' do
let(:template_content) { 'this is a test "feature-proposal" template' }
let(:fork_user) { create(:user) }
let(:fork_project) { create(:project, :public) }
let(:fork_project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project, target_project: project) }
background do
......
spec/features/projects/jobs_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ require 'tempfile'
feature 'Jobs' do
let(:user) { create(:user) }
let(:user_access_level) { :developer }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:pipeline) { create(:ci_pipeline, project: project) }
let(:job) { create(:ci_build, :trace, pipeline: pipeline) }
......
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Issue prioritization' do
let(:user) { create(:user) }
let(:project) { create(:project, name: 'test', namespace: user.namespace) }
let(:project) { create(:empty_project, name: 'test', namespace: user.namespace) }
# Labels
let(:label_1) { create(:label, title: 'label_1', project: project, priority: 1) }
......
spec/features/projects/main/download_buttons_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Download buttons in project main page' do
given(:user) { create(:user) }
given(:role) { :developer }
given(:status) { 'success' }
given(:project) { create(:project) }
given(:project) { create(:project, :repository) }
given(:pipeline) do
create(:ci_pipeline,
......
spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Projects > Members > Group member cannot leave group project' do
let(:user) { create(:user) }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
let(:project) { create(:empty_project, namespace: group) }
background do
group.add_developer(user)
......
spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Projects > Members > Group member cannot request access to his group project' do
let(:user) { create(:user) }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
let(:project) { create(:empty_project, namespace: group) }
scenario 'owner does not see the request access button' do
group.add_owner(user)
......
spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Projects > Members > Group requester cannot request access to project',
let(:user) { create(:user) }
let(:owner) { create(:user) }
let(:group) { create(:group, :public, :access_requestable) }
let(:project) { create(:project, :public, :access_requestable, namespace: group) }
let(:project) { create(:empty_project, :public, :access_requestable, namespace: group) }
background do
group.add_owner(owner)
......
spec/features/projects/members/list_spec.rb
View file @ c3b1ac85
......@@ -6,7 +6,7 @@ feature 'Project members list' do
let(:user1) { create(:user, name: 'John Doe') }
let(:user2) { create(:user, name: 'Mary Jane') }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
let(:project) { create(:empty_project, namespace: group) }
background do
sign_in(user1)
......
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ feature 'Projects > Members > Master adds member with expiration date', js: true
include ActiveSupport::Testing::TimeHelpers
let(:master) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
let!(:new_member) { create(:user) }
background do
......
spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Projects > Members > Member cannot request access to his project' do
let(:member) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
background do
project.team << [member, :developer]
......
spec/features/projects/members/member_leaves_project_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Projects > Members > Member leaves project' do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
background do
project.team << [user, :developer]
......
spec/features/projects/members/owner_cannot_leave_project_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Projects > Members > Owner cannot leave project' do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
background do
sign_in(project.owner)
......
spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Projects > Members > Owner cannot request access to his project' do
let(:project) { create(:project) }
let(:project) { create(:empty_project) }
background do
sign_in(project.owner)
......
spec/features/projects/members/user_requests_access_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Projects > Members > User requests access' do
let(:user) { create(:user) }
let(:project) { create(:project, :public, :access_requestable) }
let(:project) { create(:project, :public, :access_requestable, :repository) }
let(:master) { project.owner }
background do
......
spec/features/projects/merge_request_button_spec.rb
View file @ c3b1ac85
......@@ -3,8 +3,8 @@ require 'spec_helper'
feature 'Merge Request button' do
shared_examples 'Merge request button only shown when allowed' do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:forked_project) { create(:project, :public, forked_from_project: project) }
let(:project) { create(:project, :public, :repository) }
let(:forked_project) { create(:project, :public, :repository, forked_from_project: project) }
context 'not logged in' do
it 'does not show Create merge request button' do
......
spec/features/projects/merge_requests/list_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Merge Requests List' do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
background do
project.team << [user, :developer]
......
spec/features/projects/no_password_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'No Password Alert' do
let(:project) { create(:project, namespace: user.namespace) }
let(:project) { create(:project, :repository, namespace: user.namespace) }
context 'with internal auth enabled' do
before do
......
spec/features/projects/pipeline_schedules_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Pipeline Schedules', :js do
include PipelineSchedulesHelper
let!(:project) { create(:project) }
let!(:project) { create(:project, :repository) }
let!(:pipeline_schedule) { create(:ci_pipeline_schedule, :nightly, project: project ) }
let!(:pipeline) { create(:ci_pipeline, pipeline_schedule: pipeline_schedule) }
let(:scope) { nil }
......
spec/features/projects/pipelines/pipeline_spec.rb
View file @ c3b1ac85
......@@ -42,7 +42,7 @@ describe 'Pipeline', :js do
describe 'GET /:project/pipelines/:id' do
include_context 'pipeline builds'
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id, user: user) }
before do
......@@ -188,7 +188,7 @@ describe 'Pipeline', :js do
describe 'GET /:project/pipelines/:id/builds' do
include_context 'pipeline builds'
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) }
before do
......@@ -262,7 +262,7 @@ describe 'Pipeline', :js do
end
describe 'GET /:project/pipelines/:id/failures' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) }
let(:pipeline_failures_page) { failures_project_pipeline_path(project, pipeline) }
let!(:failed_build) { create(:ci_build, :failed, pipeline: pipeline) }
......
spec/features/projects/pipelines/pipelines_spec.rb
View file @ c3b1ac85
......@@ -12,7 +12,7 @@ describe 'Pipelines', :js do
end
describe 'GET /:project/pipelines' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let!(:pipeline) do
create(
......@@ -385,7 +385,7 @@ describe 'Pipelines', :js do
end
describe 'GET /:project/pipelines/show' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:pipeline) do
create(:ci_empty_pipeline,
......@@ -437,7 +437,7 @@ describe 'Pipelines', :js do
end
describe 'POST /:project/pipelines' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
before do
visit new_project_pipeline_path(project)
......@@ -476,7 +476,7 @@ describe 'Pipelines', :js do
end
describe 'Create pipelines' do
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
before do
visit new_project_pipeline_path(project)
......@@ -512,14 +512,14 @@ describe 'Pipelines', :js do
end
context 'when project is public' do
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
it { expect(page).to have_content 'Build with confidence' }
it { expect(page).to have_http_status(:success) }
end
context 'when project is private' do
let(:project) { create(:project, :private) }
let(:project) { create(:project, :private, :repository) }
it { expect(page).to have_content 'You need to sign in' }
end
......
spec/features/projects/project_settings_spec.rb
View file @ c3b1ac85
......@@ -55,8 +55,7 @@ describe 'Edit Project Settings' do
end
context 'when changing project path' do
# Not using empty project because we need a repo to exist
let(:project) { create(:project, namespace: user.namespace, name: 'gitlabhq') }
let(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
before(:context) do
TestEnv.clean_test_path
......@@ -97,8 +96,7 @@ describe 'Edit Project Settings' do
end
describe 'Transfer project section', js: true do
# Not using empty project because we need a repo to exist
let!(:project) { create(:project, namespace: user.namespace, name: 'gitlabhq') }
let!(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
let!(:group) { create(:group) }
before(:context) do
......
spec/features/projects/ref_switcher_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Ref switcher', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:project, :public, :repository) }
before do
project.team << [user, :master]
......
spec/features/projects/services/slack_service_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Projects > Slack service > Setup events' do
let(:user) { create(:user) }
let(:service) { SlackService.new }
let(:project) { create(:project, slack_service: service) }
let(:project) { create(:empty_project, slack_service: service) }
background do
service.fields
......
spec/features/projects/services/slack_slash_command_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Slack slash commands' do
given(:user) { create(:user) }
given(:project) { create(:project) }
given(:project) { create(:empty_project) }
given(:service) { project.create_slack_slash_commands_service }
background do
......
spec/features/projects/settings/visibility_settings_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Visibility settings', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, namespace: user.namespace, visibility_level: 20) }
let(:project) { create(:empty_project, namespace: user.namespace, visibility_level: 20) }
context 'as owner' do
before do
......
spec/features/projects/shortcuts_spec.rb
View file @ c3b1ac85
require 'spec_helper'
feature 'Project shortcuts' do
let(:project) { create(:project, name: 'Victorialand') }
let(:project) { create(:empty_project, name: 'Victorialand') }
let(:user) { create(:user) }
describe 'On a project', js: true do
......
spec/features/projects/snippets/create_snippet_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ feature 'Create Snippet', :js do
include DropzoneHelper
let(:user) { create(:user) }
let(:project) { create(:project, :repository, :public) }
let(:project) { create(:empty_project, :public) }
def fill_form
fill_in 'project_snippet_title', with: 'My Snippet Title'
......
spec/features/projects/user_browses_files_spec.rb
View file @ c3b1ac85
......@@ -7,7 +7,7 @@ describe 'User browses files' do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project, name: 'Shop') }
let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
let(:tree_path_ref_6d39438) { project_tree_path(project, '6d39438') }
......
spec/features/projects/user_creates_directory_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ feature 'User creates a directory', js: true do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project) }
let(:project) { create(:project, :repository) }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
let(:user) { create(:user) }
......
spec/features/projects/user_creates_files_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ describe 'User creates files' do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project, name: 'Shop') }
let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
......
spec/features/projects/user_deletes_files_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ describe 'User deletes files' do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project, name: 'Shop') }
let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
......
spec/features/projects/user_edits_files_spec.rb
View file @ c3b1ac85
......@@ -5,7 +5,7 @@ describe 'User edits files' do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project, name: 'Shop') }
let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
......
spec/features/projects/user_replaces_files_spec.rb
View file @ c3b1ac85
......@@ -7,7 +7,7 @@ describe 'User replaces files' do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project, name: 'Shop') }
let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
......
spec/features/projects/user_uploads_files_spec.rb
View file @ c3b1ac85
......@@ -7,7 +7,7 @@ describe 'User uploads files' do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
let(:project) { create(:project, name: 'Shop') }
let(:project) { create(:project, :repository, name: 'Shop') }
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
......
spec/features/projects/wiki/markdown_preview_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Projects > Wiki > User previews markdown changes', js: true do
let(:user) { create(:user) }
let(:project) { create(:project, namespace: user.namespace) }
let(:project) { create(:empty_project, namespace: user.namespace) }
let(:wiki_content) do
<<-HEREDOC
[regular link](regular)
......
spec/features/projects/wiki/user_creates_wiki_page_spec.rb
View file @ c3b1ac85
......@@ -11,7 +11,7 @@ feature 'Projects > Wiki > User creates wiki page', :js do
end
context 'in the user namespace' do
let(:project) { create(:project, namespace: user.namespace) }
let(:project) { create(:empty_project, namespace: user.namespace) }
context 'when wiki is empty' do
before do
......@@ -157,7 +157,7 @@ feature 'Projects > Wiki > User creates wiki page', :js do
end
context 'in a group namespace' do
let(:project) { create(:project, namespace: create(:group, :public)) }
let(:project) { create(:empty_project, namespace: create(:group, :public)) }
context 'when wiki is empty' do
before do
......
spec/features/projects/wiki/user_git_access_wiki_page_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Projects > Wiki > User views Git access wiki page' do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:wiki_page) do
WikiPages::CreateService.new(
project,
......
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
View file @ c3b1ac85
......@@ -12,7 +12,7 @@ feature 'Projects > Wiki > User updates wiki page' do
end
context 'in the user namespace' do
let(:project) { create(:project, namespace: user.namespace) }
let(:project) { create(:empty_project, namespace: user.namespace) }
context 'the home page' do
scenario 'success when the wiki content is not empty' do
......@@ -54,7 +54,7 @@ feature 'Projects > Wiki > User updates wiki page' do
end
context 'in a group namespace' do
let(:project) { create(:project, namespace: create(:group, :public)) }
let(:project) { create(:empty_project, namespace: create(:group, :public)) }
scenario 'the home page' do
click_link 'Edit'
......
spec/features/projects/wiki/user_views_project_wiki_page_spec.rb
View file @ c3b1ac85
......@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Projects > Wiki > User views the wiki page' do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project) { create(:empty_project, :public) }
let(:old_page_version_id) { wiki_page.versions.last.id }
let(:wiki_page) do
WikiPages::CreateService.new(
......
spec/features/security/group/internal_access_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'Internal Group access' do
include AccessMatchers
let(:group) { create(:group, :internal) }
let(:project) { create(:project, :internal, group: group) }
let(:project) { create(:empty_project, :internal, group: group) }
let(:project_guest) do
create(:user) do |user|
project.add_guest(user)
......@@ -51,6 +51,7 @@ describe 'Internal Group access' do
end
describe 'GET /groups/:path/merge_requests' do
let(:project) { create(:project, :internal, :repository, group: group) }
subject { merge_requests_group_path(group) }
it { is_expected.to be_allowed_for(:admin) }
......
spec/features/security/group/private_access_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'Private Group access' do
include AccessMatchers
let(:group) { create(:group, :private) }
let(:project) { create(:project, :private, group: group) }
let(:project) { create(:empty_project, :private, group: group) }
let(:project_guest) do
create(:user) do |user|
project.add_guest(user)
......@@ -51,6 +51,7 @@ describe 'Private Group access' do
end
describe 'GET /groups/:path/merge_requests' do
let(:project) { create(:project, :private, :repository, group: group) }
subject { merge_requests_group_path(group) }
it { is_expected.to be_allowed_for(:admin) }
......
spec/features/security/group/public_access_spec.rb
View file @ c3b1ac85
......@@ -4,7 +4,7 @@ describe 'Public Group access' do
include AccessMatchers
let(:group) { create(:group, :public) }
let(:project) { create(:project, :public, group: group) }
let(:project) { create(:empty_project, :public, group: group) }
let(:project_guest) do
create(:user) do |user|
project.add_guest(user)
......@@ -51,6 +51,7 @@ describe 'Public Group access' do
end
describe 'GET /groups/:path/merge_requests' do
let(:project) { create(:project, :public, :repository, group: group) }
subject { merge_requests_group_path(group) }
it { is_expected.to be_allowed_for(:admin) }
......
spec/features/security/project/internal_access_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe "Internal Project Access" do
include AccessMatchers
set(:project) { create(:project, :internal) }
set(:project) { create(:project, :internal, :repository) }
describe "Project should be internal" do
describe '#internal?' do
......
spec/features/security/project/private_access_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe "Private Project Access" do
include AccessMatchers
set(:project) { create(:project, :private, public_builds: false) }
set(:project) { create(:project, :private, :repository, public_builds: false) }
describe "Project should be private" do
describe '#private?' do
......
spec/features/security/project/public_access_spec.rb
View file @ c3b1ac85
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe "Public Project Access" do
include AccessMatchers
set(:project) { create(:project, :public) }
set(:project) { create(:project, :public, :repository) }
describe "Project should be public" do
describe '#public?' do
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7