3 files changed, 21 insertions, 8 deletions
diff --git a/spec/views/shared/access_tokens/_table.html.haml_spec.rb b/spec/views/shared/access_tokens/_table.html.haml_spec.rb
index 0a23768b4f1..fca2fc3183c 100644
--- a/spec/views/shared/access_tokens/_table.html.haml_spec.rb
+++ b/spec/views/shared/access_tokens/_table.html.haml_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
 
   let_it_be(:user) { create(:user) }
   let_it_be(:tokens) { [create(:personal_access_token, user: user)] }
-  let_it_be(:project) { false }
+  let_it_be(:resource) { false }
 
   before do
     stub_licensed_features(enforce_personal_access_token_expiration: true)
@@ -20,8 +20,8 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
     allow(view).to receive(:personal_access_token_expiration_enforced?).and_return(token_expiry_enforced?)
     allow(view).to receive(:show_profile_token_expiry_notification?).and_return(true)
 
-    if project
-      project.add_maintainer(user)
+    if resource
+      resource.add_maintainer(user)
     end
 
     # Forcibly removing scopes from one token as it's not possible to do with the current modal on creation
@@ -34,7 +34,7 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
       type: type,
       type_plural: type_plural,
       active_tokens: tokens,
-      project: project,
+      resource: resource,
       impersonation: impersonation,
       revoke_route_helper: ->(token) { 'path/' }
     }
@@ -80,8 +80,8 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
     end
   end
 
-  context 'if project' do
-    let_it_be(:project) { create(:project) }
+  context 'if resource is project' do
+    let_it_be(:resource) { create(:project) }
 
     it 'shows the project content', :aggregate_failures do
       expect(rendered).to have_selector 'th', text: 'Role'
@@ -92,6 +92,18 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
     end
   end
 
+  context 'if resource is group' do
+    let_it_be(:resource) { create(:group) }
+
+    it 'shows the group content', :aggregate_failures do
+      expect(rendered).to have_selector 'th', text: 'Role'
+      expect(rendered).to have_selector 'td', text: 'Maintainer'
+
+      expect(rendered).not_to have_content 'Personal access tokens are not revoked upon expiration.'
+      expect(rendered).not_to have_content 'To see all the user\'s personal access tokens you must impersonate them first.'
+    end
+  end
+
   context 'without tokens' do
     let_it_be(:tokens) { [] }
 
diff --git a/spec/views/shared/nav/_sidebar.html.haml_spec.rb b/spec/views/shared/nav/_sidebar.html.haml_spec.rb
index 2eeebdff7a8..0eb945f5624 100644
--- a/spec/views/shared/nav/_sidebar.html.haml_spec.rb
+++ b/spec/views/shared/nav/_sidebar.html.haml_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'shared/nav/_sidebar.html.haml' do
-  let(:project) { build(:project, id: non_existing_record_id) }
+  let_it_be(:project) { create(:project) }
+
   let(:context) { Sidebars::Projects::Context.new(current_user: nil, container: project) }
   let(:sidebar) { Sidebars::Projects::Panel.new(context) }
 
diff --git a/spec/views/shared/wikis/_sidebar.html.haml_spec.rb b/spec/views/shared/wikis/_sidebar.html.haml_spec.rb
index 70991369506..bf050d601e3 100644
--- a/spec/views/shared/wikis/_sidebar.html.haml_spec.rb
+++ b/spec/views/shared/wikis/_sidebar.html.haml_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 RSpec.describe 'shared/wikis/_sidebar.html.haml' do
   let_it_be(:project) { create(:project) }
-  let_it_be(:wiki) { Wiki.for_container(project, project.default_owner) }
+  let_it_be(:wiki) { Wiki.for_container(project, project.first_owner) }
 
   before do
     assign(:wiki, wiki)