summaryrefslogtreecommitdiff
path: root/spec/features/admin
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-02 15:55:11 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-08-02 17:47:31 -0400
commit72a7b30c9f363063449b28aa9efc3a26a1752f9f (patch)
tree173a716da52260e57a73c4a6d739fe055898d556 /spec/features/admin
parente2c3dca371f8dca8814a5924fe8ed271f0ec6399 (diff)
downloadgitlab-ce-72a7b30c9f363063449b28aa9efc3a26a1752f9f.tar.gz
Change all `:empty_project` to `:project`rs-empty_project-default
Diffstat (limited to 'spec/features/admin')
-rw-r--r--spec/features/admin/admin_disables_git_access_protocol_spec.rb2
-rw-r--r--spec/features/admin/admin_groups_spec.rb2
-rw-r--r--spec/features/admin/admin_hook_logs_spec.rb2
-rw-r--r--spec/features/admin/admin_hooks_spec.rb2
-rw-r--r--spec/features/admin/admin_projects_spec.rb4
-rw-r--r--spec/features/admin/admin_runners_spec.rb4
-rw-r--r--spec/features/admin/admin_users_spec.rb2
-rw-r--r--spec/features/admin/admin_uses_repository_checks_spec.rb4
8 files changed, 11 insertions, 11 deletions
diff --git a/spec/features/admin/admin_disables_git_access_protocol_spec.rb b/spec/features/admin/admin_disables_git_access_protocol_spec.rb
index 931f4ec3d24..9ea3cfa72c6 100644
--- a/spec/features/admin/admin_disables_git_access_protocol_spec.rb
+++ b/spec/features/admin/admin_disables_git_access_protocol_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'Admin disables Git access protocol' do
include StubENV
- let(:project) { create(:empty_project, :empty_repo) }
+ let(:project) { create(:project, :empty_repo) }
let(:admin) { create(:admin) }
background do
diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb
index 2e1bfcdcec3..3768727d8ae 100644
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -165,7 +165,7 @@ feature 'Admin Groups' do
describe 'shared projects' do
it 'renders shared project' do
- empty_project = create(:empty_project)
+ empty_project = create(:project)
empty_project.project_group_links.create!(
group_access: Gitlab::Access::MASTER,
group: group
diff --git a/spec/features/admin/admin_hook_logs_spec.rb b/spec/features/admin/admin_hook_logs_spec.rb
index 7910d5fb72b..710822ac042 100644
--- a/spec/features/admin/admin_hook_logs_spec.rb
+++ b/spec/features/admin/admin_hook_logs_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
feature 'Admin::HookLogs' do
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:system_hook) { create(:system_hook) }
let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') }
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 141109fd464..30fcb334b60 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Admin::Hooks' do
before do
- @project = create(:empty_project)
+ @project = create(:project)
sign_in(create(:admin))
@system_hook = create(:system_hook)
diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb
index 4f69eafcb9d..77710f80036 100644
--- a/spec/features/admin/admin_projects_spec.rb
+++ b/spec/features/admin/admin_projects_spec.rb
@@ -4,7 +4,7 @@ describe "Admin::Projects" do
include Select2Helper
let(:user) { create :user }
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:current_user) { create(:admin) }
before do
@@ -12,7 +12,7 @@ describe "Admin::Projects" do
end
describe "GET /admin/projects" do
- let!(:archived_project) { create :empty_project, :public, :archived }
+ let!(:archived_project) { create :project, :public, :archived }
before do
expect(project).to be_persisted
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 46bab3763cc..e3bb16af38a 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -65,8 +65,8 @@ describe "Admin Runners" do
let(:runner) { FactoryGirl.create :ci_runner }
before do
- @project1 = FactoryGirl.create(:empty_project)
- @project2 = FactoryGirl.create(:empty_project)
+ @project1 = FactoryGirl.create(:project)
+ @project2 = FactoryGirl.create(:project)
visit admin_runner_path(runner)
end
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 0dde8bb696c..e2e2b13cf8a 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -257,7 +257,7 @@ describe "Admin::Users" do
describe "GET /admin/users/:id/projects" do
let(:group) { create(:group) }
- let!(:project) { create(:empty_project, group: group) }
+ let!(:project) { create(:project, group: group) }
before do
group.add_developer(user)
diff --git a/spec/features/admin/admin_uses_repository_checks_spec.rb b/spec/features/admin/admin_uses_repository_checks_spec.rb
index 5b3ee6ee822..c2b7543a690 100644
--- a/spec/features/admin/admin_uses_repository_checks_spec.rb
+++ b/spec/features/admin/admin_uses_repository_checks_spec.rb
@@ -9,7 +9,7 @@ feature 'Admin uses repository checks' do
end
scenario 'to trigger a single check' do
- project = create(:empty_project)
+ project = create(:project)
visit_admin_project_page(project)
page.within('.repository-check') do
@@ -20,7 +20,7 @@ feature 'Admin uses repository checks' do
end
scenario 'to see a single failed repository check' do
- project = create(:empty_project)
+ project = create(:project)
project.update_columns(
last_repository_check_failed: true,
last_repository_check_at: Time.now