Update policies unit tests

This commit also makes spec/policies/namespace_policy_spec.rb file
to be compatible with the same file in GitLab EE.

2 files changed, 37 insertions, 14 deletions

diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 17dc3bb4f48..4f4e634829d 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -56,6 +56,7 @@ describe GroupPolicy do
       expect_disallowed(*developer_permissions)
       expect_disallowed(*master_permissions)
       expect_disallowed(*owner_permissions)
+      expect_disallowed(:read_namespace)
     end
   end
 
@@ -63,7 +64,7 @@ describe GroupPolicy do
     let(:current_user) { guest }
 
     it do
-      expect_allowed(:read_group)
+      expect_allowed(:read_group, :read_namespace)
       expect_disallowed(*reporter_permissions)
       expect_disallowed(*developer_permissions)
       expect_disallowed(*master_permissions)
@@ -75,7 +76,7 @@ describe GroupPolicy do
     let(:current_user) { reporter }
 
     it do
-      expect_allowed(:read_group)
+      expect_allowed(:read_group, :read_namespace)
       expect_allowed(*reporter_permissions)
       expect_disallowed(*developer_permissions)
       expect_disallowed(*master_permissions)
@@ -87,7 +88,7 @@ describe GroupPolicy do
     let(:current_user) { developer }
 
     it do
-      expect_allowed(:read_group)
+      expect_allowed(:read_group, :read_namespace)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
       expect_disallowed(*master_permissions)
@@ -99,7 +100,7 @@ describe GroupPolicy do
     let(:current_user) { master }
 
     it do
-      expect_allowed(:read_group)
+      expect_allowed(:read_group, :read_namespace)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
       expect_allowed(*master_permissions)
@@ -113,7 +114,7 @@ describe GroupPolicy do
     it do
       allow(Group).to receive(:supports_nested_groups?).and_return(true)
 
-      expect_allowed(:read_group)
+      expect_allowed(:read_group, :read_namespace)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
       expect_allowed(*master_permissions)
@@ -127,7 +128,7 @@ describe GroupPolicy do
     it do
       allow(Group).to receive(:supports_nested_groups?).and_return(true)
 
-      expect_allowed(:read_group)
+      expect_allowed(:read_group, :read_namespace)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
       expect_allowed(*master_permissions)
diff --git a/spec/policies/namespace_policy_spec.rb b/spec/policies/namespace_policy_spec.rb
index e52ff02e5f0..1fdf95ad716 100644
--- a/spec/policies/namespace_policy_spec.rb
+++ b/spec/policies/namespace_policy_spec.rb
@@ -1,20 +1,42 @@
 require 'spec_helper'
 
 describe NamespacePolicy do
-  let(:current_user) { create(:user) }
-  let(:namespace) { current_user.namespace }
+  let(:user) { create(:user) }
+  let(:owner) { create(:user) }
+  let(:admin) { create(:admin) }
+  let(:namespace) { create(:namespace, owner: owner) }
+
+  let(:owner_permissions) { [:create_projects, :admin_namespace, :read_namespace] }
 
   subject { described_class.new(current_user, namespace) }
 
-  context "create projects" do
-    context "user namespace" do
-      it { is_expected.to be_allowed(:create_projects) }
-    end
+  context 'with no user' do
+    let(:current_user) { nil }
+
+    it { is_expected.to be_banned }
+  end
+
+  context 'regular user' do
+    let(:current_user) { user }
+
+    it { is_expected.to be_disallowed(*owner_permissions) }
+  end
+
+  context 'owner' do
+    let(:current_user) { owner }
+
+    it { is_expected.to be_allowed(*owner_permissions) }
 
-    context "user who has exceeded project limit" do
-      let(:current_user) { create(:user, projects_limit: 0) }
+    context 'user who has exceeded project limit' do
+      let(:owner) { create(:user, projects_limit: 0) }
 
       it { is_expected.not_to be_allowed(:create_projects) }
     end
   end
+
+  context 'admin' do
+    let(:current_user) { admin }
+
+    it { is_expected.to be_allowed(*owner_permissions) }
+  end
 end