diff options
Diffstat (limited to 'spec/lib')
10 files changed, 11 insertions, 10 deletions
diff --git a/spec/lib/gitlab/ci/secure_files/cer_spec.rb b/spec/lib/gitlab/ci/secure_files/cer_spec.rb index 1393e8d2efd..76ce1785368 100644 --- a/spec/lib/gitlab/ci/secure_files/cer_spec.rb +++ b/spec/lib/gitlab/ci/secure_files/cer_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Gitlab::Ci::SecureFiles::Cer do describe '#expires_at' do it 'returns the certificate expiration timestamp' do - expect(subject.metadata[:expires_at]).to eq('2022-04-26 19:20:40 UTC') + expect(subject.metadata[:expires_at]).to eq('2023-04-26 19:20:39 UTC') end end diff --git a/spec/lib/gitlab/ci/secure_files/p12_spec.rb b/spec/lib/gitlab/ci/secure_files/p12_spec.rb index beabf4b4856..7a855868ce8 100644 --- a/spec/lib/gitlab/ci/secure_files/p12_spec.rb +++ b/spec/lib/gitlab/ci/secure_files/p12_spec.rb @@ -62,7 +62,7 @@ RSpec.describe Gitlab::Ci::SecureFiles::P12 do describe '#expires_at' do it 'returns the certificate expiration timestamp' do - expect(subject.metadata[:expires_at]).to eq('2022-09-21 14:56:00 UTC') + expect(subject.metadata[:expires_at]).to eq('2023-09-21 14:55:59 UTC') end end diff --git a/spec/lib/sidebars/groups/menus/issues_menu_spec.rb b/spec/lib/sidebars/groups/menus/issues_menu_spec.rb index ceeda4a7ac3..415011e0027 100644 --- a/spec/lib/sidebars/groups/menus/issues_menu_spec.rb +++ b/spec/lib/sidebars/groups/menus/issues_menu_spec.rb @@ -57,10 +57,9 @@ RSpec.describe Sidebars::Groups::Menus::IssuesMenu, feature_category: :navigatio { item_id: :group_issue_list, active_routes: { path: 'groups#issues' }, - sprite_icon: 'issues', pill_count: menu.pill_count, has_pill: menu.has_pill?, - super_sidebar_parent: ::Sidebars::StaticMenu + super_sidebar_parent: Sidebars::Groups::SuperSidebarMenus::PlanMenu } end end diff --git a/spec/lib/sidebars/groups/menus/merge_requests_menu_spec.rb b/spec/lib/sidebars/groups/menus/merge_requests_menu_spec.rb index 72f85f7930a..a4421226eeb 100644 --- a/spec/lib/sidebars/groups/menus/merge_requests_menu_spec.rb +++ b/spec/lib/sidebars/groups/menus/merge_requests_menu_spec.rb @@ -38,10 +38,9 @@ RSpec.describe Sidebars::Groups::Menus::MergeRequestsMenu, feature_category: :na let(:extra_attrs) do { item_id: :group_merge_request_list, - sprite_icon: 'git-merge', pill_count: menu.pill_count, has_pill: menu.has_pill?, - super_sidebar_parent: ::Sidebars::StaticMenu + super_sidebar_parent: Sidebars::Groups::SuperSidebarMenus::CodeMenu } end end diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb index d289295d119..1d228a455ec 100644 --- a/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb +++ b/spec/lib/sidebars/groups/super_sidebar_menus/plan_menu_spec.rb @@ -15,6 +15,8 @@ RSpec.describe Sidebars::Groups::SuperSidebarMenus::PlanMenu, feature_category: it 'defines list of NilMenuItem placeholders' do expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem]) expect(items.map(&:item_id)).to eq([ + :group_issue_list, + :group_epic_list, :issue_boards, :epic_boards, :roadmap, diff --git a/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb b/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb index 7362f88ab3c..5035da9c488 100644 --- a/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb +++ b/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb @@ -34,6 +34,7 @@ RSpec.describe Sidebars::Groups::SuperSidebarPanel, feature_category: :navigatio Sidebars::StaticMenu, Sidebars::Groups::SuperSidebarMenus::ManageMenu, Sidebars::Groups::SuperSidebarMenus::PlanMenu, + Sidebars::Groups::SuperSidebarMenus::CodeMenu, Sidebars::Groups::SuperSidebarMenus::BuildMenu, Sidebars::Groups::SuperSidebarMenus::SecureMenu, Sidebars::Groups::SuperSidebarMenus::OperationsMenu, diff --git a/spec/lib/sidebars/projects/menus/issues_menu_spec.rb b/spec/lib/sidebars/projects/menus/issues_menu_spec.rb index f783e7fcff2..544cbcb956d 100644 --- a/spec/lib/sidebars/projects/menus/issues_menu_spec.rb +++ b/spec/lib/sidebars/projects/menus/issues_menu_spec.rb @@ -14,10 +14,9 @@ RSpec.describe Sidebars::Projects::Menus::IssuesMenu, feature_category: :navigat let(:extra_attrs) do { item_id: :project_issue_list, - sprite_icon: 'issues', pill_count: menu.pill_count, has_pill: menu.has_pill?, - super_sidebar_parent: ::Sidebars::StaticMenu + super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::PlanMenu } end end diff --git a/spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb b/spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb index 697f8a6d7c7..08f35b6acd0 100644 --- a/spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb +++ b/spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb @@ -15,10 +15,9 @@ RSpec.describe Sidebars::Projects::Menus::MergeRequestsMenu, feature_category: : let(:extra_attrs) do { item_id: :project_merge_request_list, - sprite_icon: 'git-merge', pill_count: menu.pill_count, has_pill: menu.has_pill?, - super_sidebar_parent: ::Sidebars::StaticMenu + super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::CodeMenu } end end diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/code_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/code_menu_spec.rb index e307ff91234..8f69717eb29 100644 --- a/spec/lib/sidebars/projects/super_sidebar_menus/code_menu_spec.rb +++ b/spec/lib/sidebars/projects/super_sidebar_menus/code_menu_spec.rb @@ -15,6 +15,7 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::CodeMenu, feature_category it 'defines list of NilMenuItem placeholders' do expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem]) expect(items.map(&:item_id)).to eq([ + :project_merge_request_list, :files, :branches, :commits, diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb index 9f3aa62a364..57e6950dd69 100644 --- a/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb +++ b/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb @@ -15,6 +15,7 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::PlanMenu, feature_category it 'defines list of NilMenuItem placeholders' do expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem]) expect(items.map(&:item_id)).to eq([ + :project_issue_list, :boards, :project_wiki, :service_desk, |