summaryrefslogtreecommitdiff
path: root/spec/features/security
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2014-03-19 05:15:24 -0400
committerRobert Speicher <rspeicher@gmail.com>2014-03-19 05:15:24 -0400
commit1897fb00b8d804cffa40da074f83575489beddb0 (patch)
tree8492bd315ba3229feef426406cfd6b45a60392cf /spec/features/security
parent65d634706cf833fc4b0b2f263f9d8fb35219858e (diff)
downloadgitlab-ce-1897fb00b8d804cffa40da074f83575489beddb0.tar.gz
Make use of project factory traits
Diffstat (limited to 'spec/features/security')
-rw-r--r--spec/features/security/group/internal_group_access_spec.rb2
-rw-r--r--spec/features/security/group/mixed_group_access_spec.rb4
-rw-r--r--spec/features/security/group/public_group_access_spec.rb2
-rw-r--r--spec/features/security/project/internal_access_spec.rb7
4 files changed, 5 insertions, 10 deletions
diff --git a/spec/features/security/group/internal_group_access_spec.rb b/spec/features/security/group/internal_group_access_spec.rb
index 0c354f02456..79a6aee41b5 100644
--- a/spec/features/security/group/internal_group_access_spec.rb
+++ b/spec/features/security/group/internal_group_access_spec.rb
@@ -16,7 +16,7 @@ describe "Group with internal project access" do
group.add_user(reporter, Gitlab::Access::REPORTER)
group.add_user(guest, Gitlab::Access::GUEST)
- create(:project, group: group, visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+ create(:project, :internal, group: group)
end
describe "GET /groups/:path" do
diff --git a/spec/features/security/group/mixed_group_access_spec.rb b/spec/features/security/group/mixed_group_access_spec.rb
index 82e816e388a..028cd32d2bb 100644
--- a/spec/features/security/group/mixed_group_access_spec.rb
+++ b/spec/features/security/group/mixed_group_access_spec.rb
@@ -16,8 +16,8 @@ describe "Group access" do
group.add_user(reporter, Gitlab::Access::REPORTER)
group.add_user(guest, Gitlab::Access::GUEST)
- create(:project, path: "internal_project", group: group, visibility_level: Gitlab::VisibilityLevel::INTERNAL)
- create(:project, path: "public_project", group: group, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+ create(:project, :internal, path: "internal_project", group: group)
+ create(:project, :public, path: "public_project", group: group)
end
describe "GET /groups/:path" do
diff --git a/spec/features/security/group/public_group_access_spec.rb b/spec/features/security/group/public_group_access_spec.rb
index a9c0afbb60f..f0ed7649eb5 100644
--- a/spec/features/security/group/public_group_access_spec.rb
+++ b/spec/features/security/group/public_group_access_spec.rb
@@ -16,7 +16,7 @@ describe "Group with public project access" do
group.add_user(reporter, Gitlab::Access::REPORTER)
group.add_user(guest, Gitlab::Access::GUEST)
- create(:project, group: group, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+ create(:project, :public, group: group)
end
describe "GET /groups/:path" do
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index 8bb1e259efa..152cf66dcfd 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -1,23 +1,18 @@
require 'spec_helper'
describe "Internal Project Access" do
- let(:project) { create(:project) }
+ let(:project) { create(:project, :internal) }
let(:master) { create(:user) }
let(:guest) { create(:user) }
let(:reporter) { create(:user) }
before do
- # internal project
- project.visibility_level = Gitlab::VisibilityLevel::INTERNAL
- project.save!
-
# full access
project.team << [master, :master]
# readonly
project.team << [reporter, :reporter]
-
end
describe "Project should be internal" do