spec/frontend/notes/components/noteable_note_spec.js

@@ -292,7 +292,7 @@ describe('issue_note', () => {
 
   describe('internal note', () => {
     it('has internal note class for internal notes', () => {
-      createWrapper({ note: { ...note, confidential: true } });
+      createWrapper({ note: { ...note, internal: true } });
 
       expect(wrapper.classes()).toContain('internal-note');
     });

spec/lib/banzai/filter/blockquote_fence_filter_spec.rb

@@ -14,10 +14,22 @@
     expect(output).to eq(expected)
   end
 
+  it 'does not require newlines at start or end of string' do
+    expect(filter(">>>\ntest\n>>>")).to eq("\n> test\n")
+  end
+
   it 'allows trailing whitespace on blockquote fence lines' do
     expect(filter(">>> \ntest\n>>> ")).to eq("\n> test\n")
   end
 
+  context 'when feature flag is turned off' do
+    it 'does not require a leading or trailing blank line' do
+      stub_feature_flags(markdown_corrected_blockquote: false)
+
+      expect(filter("Foo\n>>>\ntest\n>>>\nBar")).to eq("Foo\n\n> test\n\nBar")
+    end
+  end
+
   context 'when incomplete blockquote fences with multiple blocks are present' do
     it 'does not raise timeout error' do
       test_string = ">>>#{"\n```\nfoo\n```" * 20}"

spec/lib/banzai/pipeline/pre_process_pipeline_spec.rb

@@ -32,4 +32,21 @@
 
     expect(result[:output]).to eq('foo foo f...')
   end
+
+  context 'when multiline blockquote' do
+    it 'data-sourcepos references correct line in source markdown' do
+      markdown = <<~MD
+        >>>
+        foo
+        >>>
+      MD
+
+      pipeline_output = described_class.call(markdown, {})[:output]
+      pipeline_output = Banzai::Pipeline::PlainMarkdownPipeline.call(pipeline_output, {})[:output]
+      sourcepos = pipeline_output.at('blockquote')['data-sourcepos']
+      source_line = sourcepos.split(':').first.to_i
+
+      expect(markdown.lines[source_line - 1]).to eq "foo\n"
+    end
+  end
 end

spec/lib/gitlab/shell_spec.rb

@@ -9,9 +9,13 @@
   let(:repository) { project.repository }
   let(:gitlab_shell) { described_class.new }
 
+  before do
+    described_class.instance_variable_set(:@secret_token, nil)
+  end
+
   it { is_expected.to respond_to :remove_repository }
 
-  describe 'memoized secret_token' do
+  describe '.secret_token' do
     let(:secret_file) { 'tmp/tests/.secret_shell_test' }
     let(:link_file) { 'tmp/tests/shell-secret-test/.gitlab_shell_secret' }
 
@@ -19,7 +23,6 @@
       allow(Gitlab.config.gitlab_shell).to receive(:secret_file).and_return(secret_file)
       allow(Gitlab.config.gitlab_shell).to receive(:path).and_return('tmp/tests/shell-secret-test')
       FileUtils.mkdir('tmp/tests/shell-secret-test')
-      described_class.ensure_secret_token!
     end
 
     after do
@@ -27,13 +30,47 @@
       FileUtils.rm_rf(secret_file)
     end
 
-    it 'creates and links the secret token file' do
-      secret_token = described_class.secret_token
+    shared_examples 'creates and links the secret token file' do
+      it 'creates and links the secret token file' do
+        secret_token = described_class.secret_token
+
+        expect(File.exist?(secret_file)).to be(true)
+        expect(File.read(secret_file).chomp).to eq(secret_token)
+        expect(File.symlink?(link_file)).to be(true)
+        expect(File.readlink(link_file)).to eq(secret_file)
+      end
+    end
+
+    describe 'memoized secret_token' do
+      before do
+        described_class.ensure_secret_token!
+      end
+
+      it_behaves_like 'creates and links the secret token file'
+    end
+
+    context 'when link_file is a broken symbolic link' do
+      before do
+        File.symlink('tmp/tests/non_existing_file', link_file)
+        described_class.ensure_secret_token!
+      end
+
+      it_behaves_like 'creates and links the secret token file'
+    end
+
+    context 'when secret_file exists' do
+      let(:secret_token) { 'secret-token' }
 
-      expect(File.exist?(secret_file)).to be(true)
-      expect(File.read(secret_file).chomp).to eq(secret_token)
-      expect(File.symlink?(link_file)).to be(true)
-      expect(File.readlink(link_file)).to eq(secret_file)
+      before do
+        File.write(secret_file, 'secret-token')
+        described_class.ensure_secret_token!
+      end
+
+      it_behaves_like 'creates and links the secret token file'
+
+      it 'reads the token from the existing file' do
+        expect(described_class.secret_token).to eq(secret_token)
+      end
     end
   end
 

spec/models/ci/build_spec.rb

@@ -3607,17 +3607,6 @@
           it 'includes deploy token variables' do
             is_expected.to include(*deploy_token_variables)
           end
-
-          context 'when the FF ci_variable_for_group_gitlab_deploy_token is disabled' do
-            before do
-              stub_feature_flags(ci_variable_for_group_gitlab_deploy_token: false)
-            end
-
-            it 'does not include deploy token variables' do
-              expect(subject.find { |v| v[:key] == 'CI_DEPLOY_USER' }).to be_nil
-              expect(subject.find { |v| v[:key] == 'CI_DEPLOY_PASSWORD' }).to be_nil
-            end
-          end
         end
       end
     end

spec/models/project_spec.rb

@@ -6157,14 +6157,6 @@ def has_external_wiki
       let!(:deploy_token) { create(:deploy_token, :gitlab_deploy_token, :group, groups: [group]) }
 
       it { is_expected.to eq(deploy_token) }
-
-      context 'when the FF ci_variable_for_group_gitlab_deploy_token is disabled' do
-        before do
-          stub_feature_flags(ci_variable_for_group_gitlab_deploy_token: false)
-        end
-
-        it { is_expected.to be_nil }
-      end
     end
 
     context 'when the project and its group has a gitlab deploy token associated' do
@@ -6174,14 +6166,6 @@ def has_external_wiki
       let!(:group_deploy_token) { create(:deploy_token, :gitlab_deploy_token, :group, groups: [group]) }
 
       it { is_expected.to eq(project_deploy_token) }
-
-      context 'when the FF ci_variable_for_group_gitlab_deploy_token is disabled' do
-        before do
-          stub_feature_flags(ci_variable_for_group_gitlab_deploy_token: false)
-        end
-
-        it { is_expected.to eq(project_deploy_token) }
-      end
     end
   end
 

spec/models/users/ghost_user_migration_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Users::GhostUserMigration do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+    it { is_expected.to belong_to(:initiator_user) }
+  end
+
+  describe 'validation' do
+    it { is_expected.to validate_presence_of(:user_id) }
+  end
+end

spec/services/issues/build_service_spec.rb

@@ -63,11 +63,13 @@ def build_issue(issue_params = {})
 
       it 'wraps the note in a blockquote' do
         note_text = "This is a string\n"\
+                    "\n"\
                     ">>>\n"\
                     "with a blockquote\n"\
                     "> That has a quote\n"\
                     ">>>\n"
         note_result = "    > This is a string\n"\
+                      "    > \n"\
                       "    > \n"\
                       "    > > with a blockquote\n"\
                       "    > > > That has a quote\n"\

spec/services/projects/create_service_spec.rb

@@ -417,10 +417,10 @@ def wiki_repo(project)
       expect(imported_project.import_url).to eq('http://import-url')
     end
 
-    it 'tracks for the combined_registration experiment', :experiment do
-      expect(experiment(:combined_registration)).to track(:import_project).on_next_instance
-
+    it 'tracks for imported project' do
       imported_project
+
+      expect_snowplow_event(category: described_class.name, action: 'import_project', user: user)
     end
 
     describe 'import scheduling' do

spec/support/helpers/snowplow_helpers.rb

@@ -7,7 +7,7 @@ module SnowplowHelpers
   #
   # Examples:
   #
-  #   describe '#show', :snowplow do
+  #   describe '#show' do
   #     it 'tracks snowplow events' do
   #       get :show
   #
@@ -15,7 +15,7 @@ module SnowplowHelpers
   #     end
   #   end
   #
-  #   describe '#create', :snowplow do
+  #   describe '#create' do
   #     it 'tracks snowplow events' do
   #       post :create
   #

spec/support/rspec_order_todo.yml

@@ -216,7 +216,6 @@
 - './ee/spec/elastic/migrate/20220512150000_pause_indexing_for_unsupported_es_versions_spec.rb'
 - './ee/spec/elastic/migrate/20220613120500_migrate_commits_to_separate_index_spec.rb'
 - './ee/spec/elastic/migrate/20220713103500_delete_commits_from_original_index_spec.rb'
-- './ee/spec/experiments/combined_registration_experiment_spec.rb'
 - './ee/spec/factories/lfs_object_spec.rb'
 - './ee/spec/features/account_recovery_regular_check_spec.rb'
 - './ee/spec/features/admin/admin_audit_logs_spec.rb'

spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb

@@ -8,7 +8,7 @@
       set_protected_branch_name('master')
 
       find(".js-allowed-to-merge").click
-      within('.rspec-allowed-to-merge-dropdown') do
+      within('[data-testid="allowed-to-merge-dropdown"]') do
         expect(first("li")).to have_content("Roles")
         find(:link, 'No one').click
       end
@@ -35,13 +35,13 @@
       set_protected_branch_name('master')
 
       find(".js-allowed-to-merge").click
-      within('.rspec-allowed-to-merge-dropdown') do
+      within('[data-testid="allowed-to-merge-dropdown"]') do
         expect(first("li")).to have_content("Roles")
         find(:link, 'No one').click
       end
 
       find(".js-allowed-to-push").click
-      within('.rspec-allowed-to-push-dropdown') do
+      within('[data-testid="allowed-to-push-dropdown"]') do
         expect(first("li")).to have_content("Roles")
         find(:link, 'No one').click
       end
@@ -83,7 +83,7 @@
       end
 
       find(".js-allowed-to-push").click
-      within('.rspec-allowed-to-push-dropdown') do
+      within('[data-testid="allowed-to-push-dropdown"]') do
         expect(first("li")).to have_content("Roles")
         find(:link, 'No one').click
       end
@@ -100,13 +100,13 @@
       set_protected_branch_name('master')
 
       find(".js-allowed-to-merge").click
-      within('.rspec-allowed-to-merge-dropdown') do
+      within('[data-testid="allowed-to-merge-dropdown"]') do
         expect(first("li")).to have_content("Roles")
         find(:link, 'No one').click
       end
 
       find(".js-allowed-to-push").click
-      within('.rspec-allowed-to-push-dropdown') do
+      within('[data-testid="allowed-to-push-dropdown"]') do
         expect(first("li")).to have_content("Roles")
         find(:link, 'No one').click
       end

spec/support/shared_examples/features/protected_branches_with_deploy_keys_examples.rb

@@ -23,7 +23,7 @@
         find(".js-allowed-to-push").click
         wait_for_requests
 
-        within('.qa-allowed-to-push-dropdown') do # rubocop:disable QA/SelectorUsage
+        within('[data-testid="allowed-to-push-dropdown"]') do
           dropdown_headers = page.all('.dropdown-header').map(&:text)
 
           expect(dropdown_headers).to contain_exactly(*all_dropdown_sections)
@@ -38,7 +38,7 @@
         find(".js-allowed-to-merge").click
         wait_for_requests
 
-        within('.qa-allowed-to-merge-dropdown') do # rubocop:disable QA/SelectorUsage
+        within('[data-testid="allowed-to-merge-dropdown"]') do
           dropdown_headers = page.all('.dropdown-header').map(&:text)
 
           expect(dropdown_headers).to contain_exactly(*dropdown_sections_minus_deploy_keys)
@@ -68,7 +68,7 @@
         find(".js-allowed-to-push").click
         wait_for_requests
 
-        within('.qa-allowed-to-push-dropdown') do # rubocop:disable QA/SelectorUsage
+        within('[data-testid="allowed-to-push-dropdown"]') do
           dropdown_headers = page.all('.dropdown-header').map(&:text)
 
           expect(dropdown_headers).to contain_exactly(*dropdown_sections_minus_deploy_keys)

spec/support/shared_examples/features/rss_shared_examples.rb

@@ -9,7 +9,7 @@
 RSpec.shared_examples "it has an RSS button with current_user's feed token" do
   it "shows the RSS button with current_user's feed token" do
     expect(page)
-      .to have_css("a:has(.qa-rss-icon)[href*='feed_token=#{user.feed_token}']") # rubocop:disable QA/SelectorUsage
+      .to have_css("a:has([data-testid='rss-icon'])[href*='feed_token=#{user.feed_token}']")
   end
 end
 
@@ -22,7 +22,7 @@
 RSpec.shared_examples "it has an RSS button without a feed token" do
   it "shows the RSS button without a feed token" do
     expect(page)
-      .to have_css("a:has(.qa-rss-icon):not([href*='feed_token'])") # rubocop:disable QA/SelectorUsage
+      .to have_css("a:has([data-testid='rss-icon']):not([href*='feed_token'])")
   end
 end
 

spec/views/admin/sessions/new.html.haml_spec.rb

@@ -19,9 +19,9 @@
     it 'shows enter password form' do
       render
 
-      expect(rendered).to have_selector('[data-qa-selector="sign_in_tab"]') # rubocop:disable QA/SelectorUsage
+      expect(rendered).to have_selector('[data-testid="sign-in-tab"]')
       expect(rendered).to have_css('#login-pane.active')
-      expect(rendered).to have_selector('[data-qa-selector="password_field"]') # rubocop:disable QA/SelectorUsage
+      expect(rendered).to have_selector('[data-testid="password-field"]')
     end
 
     it 'warns authentication not possible if password not set' do
@@ -60,7 +60,7 @@
     it 'is shown when enabled' do
       render
 
-      expect(rendered).to have_selector('[data-qa-selector="ldap_tab"]') # rubocop:disable QA/SelectorUsage
+      expect(rendered).to have_selector('[data-testid="ldap-tab"]')
       expect(rendered).to have_css('.login-box#ldapmain')
       expect(rendered).to have_field('LDAP Username')
       expect(rendered).not_to have_content('No authentication methods configured')
@@ -71,7 +71,7 @@
 
       render
 
-      expect(rendered).not_to have_selector('[data-qa-selector="ldap_tab"]') # rubocop:disable QA/SelectorUsage
+      expect(rendered).not_to have_selector('[data-testid="ldap-tab"]')
       expect(rendered).not_to have_field('LDAP Username')
       expect(rendered).to have_content('No authentication methods configured')
     end

spec/views/devise/sessions/new.html.haml_spec.rb

@@ -55,7 +55,7 @@
         render
 
         expect(rendered).to have_selector('.new-session-tabs')
-        expect(rendered).to have_selector('[data-qa-selector="ldap_tab"]') # rubocop:disable QA/SelectorUsage
+        expect(rendered).to have_selector('[data-testid="ldap-tab"]')
         expect(rendered).to have_field('LDAP Username')
       end
 
@@ -65,7 +65,7 @@
         render
 
         expect(rendered).to have_content('No authentication methods configured')
-        expect(rendered).not_to have_selector('[data-qa-selector="ldap_tab"]') # rubocop:disable QA/SelectorUsage
+        expect(rendered).not_to have_selector('[data-testid="ldap-tab"]')
         expect(rendered).not_to have_field('LDAP Username')
       end
     end

vendor/gems/omniauth-cas3/lib/omniauth/strategies/cas3.rb

@@ -62,9 +62,14 @@ class InvalidCASTicket < StandardError; end
       end
 
       extra do
-        prune!(
-          raw_info.delete_if{ |k,v| AuthHashSchemaKeys.include?(k) }
-        )
+        hash = {}
+
+        unless skip_info?
+          hash = raw_info.dup
+          hash.delete_if { |k, _v| AuthHashSchemaKeys.include?(k) }
+        end
+
+        prune! hash
       end
 
       uid do

vendor/gems/omniauth-cas3/spec/omniauth/strategies/cas3_spec.rb

 require 'spec_helper'
+require 'securerandom'
 
 describe OmniAuth::Strategies::CAS3, type: :strategy do
   include Rack::Test::Methods
@@ -15,17 +16,32 @@
     }.to_app
   end
 
+  let(:csrf_token) { SecureRandom.base64(32) }
+  let(:base_env) { { 'rack.session' => { csrf: csrf_token }, 'rack.input' => StringIO.new("authenticity_token=#{escaped_token}") } }
+  let(:post_env) { make_env('/auth/cas3', base_env.merge(request_env)) }
+  let(:escaped_token) { URI.encode_www_form_component(csrf_token, Encoding::UTF_8) }
+
+  def make_env(path = '/auth/cas3', props = {})
+    {
+      'REQUEST_METHOD' => 'POST',
+      'PATH_INFO' => path,
+      'rack.session' => {},
+      'rack.input' => StringIO.new('test=true')
+    }.merge(props)
+  end
+
   # TODO: Verify that these are even useful tests
   shared_examples_for 'a CAS redirect response' do
     let(:redirect_params) { 'service=' + Rack::Utils.escape("http://example.org/auth/cas3/callback?url=#{Rack::Utils.escape(return_url)}") }
 
-    before { get url, nil, request_env }
+    before { post url, nil, post_env }
 
     subject { last_response }
 
     it { should be_redirect }
 
     it 'redirects to the CAS server' do
+      expect(subject.status).to eq(302)
       expect(subject.headers).to include 'Location' => "http://cas.example.org:8080/login?#{redirect_params}"
     end
   end
@@ -78,7 +94,7 @@
     it { should include('ssl' => true) }
   end
 
-  describe 'GET /auth/cas3' do
+  describe 'POST /auth/cas3' do
     let(:return_url) { 'http://myapp.com/admin/foo' }
 
     context 'with a referer' do