Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests/admin')
-rw-r--r--spec/requests/admin/admin_hooks_spec.rb8
-rw-r--r--spec/requests/admin/admin_projects_spec.rb8
-rw-r--r--spec/requests/admin/admin_users_spec.rb10
3 files changed, 13 insertions, 13 deletions
diff --git a/spec/requests/admin/admin_hooks_spec.rb b/spec/requests/admin/admin_hooks_spec.rb
index 2f026aabab8..3f35b2fd37d 100644
--- a/spec/requests/admin/admin_hooks_spec.rb
+++ b/spec/requests/admin/admin_hooks_spec.rb
@@ -2,12 +2,12 @@ require 'spec_helper'
describe "Admin::Hooks" do
before do
- @project = Factory :project,
- name: "LeGiT",
- code: "LGT"
+ @project = create(:project,
+ name: "LeGiT",
+ code: "LGT")
login_as :admin
- @system_hook = Factory :system_hook
+ @system_hook = create(:system_hook)
end
diff --git a/spec/requests/admin/admin_projects_spec.rb b/spec/requests/admin/admin_projects_spec.rb
index 61e66eec08b..43e39d7cbcd 100644
--- a/spec/requests/admin/admin_projects_spec.rb
+++ b/spec/requests/admin/admin_projects_spec.rb
@@ -2,9 +2,9 @@ require 'spec_helper'
describe "Admin::Projects" do
before do
- @project = Factory :project,
- name: "LeGiT",
- code: "LGT"
+ @project = create(:project,
+ name: "LeGiT",
+ code: "LGT")
login_as :admin
end
@@ -104,7 +104,7 @@ describe "Admin::Projects" do
describe "Add new team member" do
before do
- @new_user = Factory :user
+ @new_user = create(:user)
visit admin_project_path(@project)
end
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/requests/admin/admin_users_spec.rb
index 68358bf0a0f..9f43f07a476 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -76,7 +76,7 @@ describe "Admin::Users" do
describe "GET /admin/users/:id/edit" do
before do
- @simple_user = Factory :user
+ @simple_user = create(:user)
visit admin_users_path
click_link "edit_user_#{@simple_user.id}"
end
@@ -107,13 +107,13 @@ describe "Admin::Users" do
end
end
- describe "Add new project" do
- before do
- @new_project = Factory :project
+ describe "Add new project" do
+ before do
+ @new_project = create(:project)
visit admin_user_path(@user)
end
- it "should create new user" do
+ it "should create new user" do
select @new_project.name, from: "project_ids"
expect { click_button "Add" }.to change { UsersProject.count }.by(1)
page.should have_content @new_project.name