summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
Diffstat (limited to 'features')
-rw-r--r--features/steps/explore/groups.rb2
-rw-r--r--features/steps/group/milestones.rb2
-rw-r--r--features/steps/groups.rb4
-rw-r--r--features/steps/project/deploy_keys.rb4
-rw-r--r--features/steps/project/redirects.rb4
-rw-r--r--features/steps/project/team_management.rb4
-rw-r--r--features/steps/shared/project.rb6
-rw-r--r--features/steps/user.rb2
8 files changed, 14 insertions, 14 deletions
diff --git a/features/steps/explore/groups.rb b/features/steps/explore/groups.rb
index 4fd5fb6e07a..409bf0cb416 100644
--- a/features/steps/explore/groups.rb
+++ b/features/steps/explore/groups.rb
@@ -66,7 +66,7 @@ class Spinach::Features::ExploreGroups < Spinach::FeatureSteps
def group_has_project(groupname, projectname, visibility_level)
group = Group.find_by(name: groupname) || create(:group, name: groupname)
- project = create(:empty_project,
+ project = create(:project,
namespace: group,
name: projectname,
path: "#{groupname}-#{projectname}",
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index 915d766dd60..f6559b6be2f 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -100,7 +100,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
group = owned_group
%w(gitlabhq gitlab-ci cookbook-gitlab).each do |path|
- project = create(:empty_project, path: path, group: group)
+ project = create(:project, path: path, group: group)
milestone = create :milestone, title: "Version 7.2", project: project
create(:label, project: project, title: 'bug')
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index 6b288b47da4..a2d9a0332e0 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -15,7 +15,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step 'Group "Owned" has a public project "Public-project"' do
group = owned_group
- @project = create :empty_project, :public,
+ @project = create :project, :public,
group: group,
name: "Public-project"
end
@@ -109,7 +109,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step 'Group "Owned" has archived project' do
group = Group.find_by(name: 'Owned')
- @archived_project = create(:empty_project, :archived, namespace: group, path: "archived-project")
+ @archived_project = create(:project, :archived, namespace: group, path: "archived-project")
end
step 'I should see "archived" label' do
diff --git a/features/steps/project/deploy_keys.rb b/features/steps/project/deploy_keys.rb
index b58d595c7c6..b4403becb0d 100644
--- a/features/steps/project/deploy_keys.rb
+++ b/features/steps/project/deploy_keys.rb
@@ -47,11 +47,11 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
end
step 'other projects have deploy keys' do
- @second_project = create(:empty_project, namespace: create(:group))
+ @second_project = create(:project, namespace: create(:group))
@second_project.team << [current_user, :master]
create(:deploy_keys_project, project: @second_project)
- @third_project = create(:empty_project, namespace: create(:group))
+ @third_project = create(:project, namespace: create(:group))
@third_project.team << [current_user, :master]
create(:deploy_keys_project, project: @third_project, deploy_key: @second_project.deploy_keys.first)
end
diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb
index cbe6f93f87e..53a2463af53 100644
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
@@ -4,11 +4,11 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
include SharedProject
step 'public project "Community"' do
- create(:empty_project, :public, name: 'Community')
+ create(:project, :public, name: 'Community')
end
step 'private project "Enterprise"' do
- create(:empty_project, :private, name: 'Enterprise')
+ create(:project, :private, name: 'Enterprise')
end
step 'I visit project "Community" page' do
diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index ff4c9deee2a..5c4025ace34 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -34,7 +34,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
end
step 'I own project "Website"' do
- @project = create(:empty_project, name: "Website", namespace: @user.namespace)
+ @project = create(:project, name: "Website", namespace: @user.namespace)
@project.team << [@user, :master]
end
@@ -68,7 +68,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
step 'I share project with group "OpenSource"' do
project = Project.find_by(name: 'Shop')
os_group = create(:group, name: 'OpenSource')
- create(:empty_project, group: os_group)
+ create(:project, group: os_group)
@os_user1 = create(:user)
@os_user2 = create(:user)
os_group.add_owner(@os_user1)
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 846d546ed01..f6edf93b311 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -9,7 +9,7 @@ module SharedProject
step "I own a project in some group namespace" do
@group = create(:group, name: 'some group')
- @project = create(:empty_project, namespace: @group)
+ @project = create(:project, namespace: @group)
@project.team << [@user, :master]
end
@@ -54,7 +54,7 @@ module SharedProject
# Create an empty project without caring about the name
step 'I own an empty project' do
- @project = create(:empty_project,
+ @project = create(:project,
name: 'Empty Project', namespace: @user.namespace)
@project.team << [@user, :master]
end
@@ -276,7 +276,7 @@ module SharedProject
def user_owns_project(user_name:, project_name:, visibility: :private)
user = user_exists(user_name, username: user_name.gsub(/\s/, '').underscore)
project = Project.find_by(name: project_name)
- project ||= create(:empty_project, visibility, name: project_name, namespace: user.namespace)
+ project ||= create(:project, visibility, name: project_name, namespace: user.namespace)
project.team << [user, :master]
end
end
diff --git a/features/steps/user.rb b/features/steps/user.rb
index 271c9b097d4..59385a6ab59 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -38,6 +38,6 @@ class Spinach::Features::User < Spinach::FeatureSteps
end
def contributed_project
- @contributed_project ||= create(:empty_project, :public)
+ @contributed_project ||= create(:project, :public)
end
end