Automatic merge of gitlab-org/gitlab master

spec/models/ci/runner_spec.rb

@@ -1737,6 +1737,22 @@ def does_db_update
     end
   end
 
+  describe '#token' do
+    subject(:token) { runner.token }
+
+    context 'when runner is registered' do
+      let(:runner) { create(:ci_runner) }
+
+      it { is_expected.not_to start_with('glrt-') }
+    end
+
+    context 'when runner is created in UI' do
+      let(:runner) { create(:ci_runner, :created_in_ui) }
+
+      it { is_expected.to start_with('glrt-') }
+    end
+  end
+
   describe '#token_expires_at', :freeze_time do
     shared_examples 'expiring token' do |interval:|
       it 'expires' do

spec/models/repository_spec.rb

@@ -2775,14 +2775,36 @@ def mock_gitaly(second_response)
       it 'returns a Tree' do
         expect(repository.head_tree).to be_an_instance_of(Tree)
       end
+
+      context 'when feature flag "optimized_head_tree" is disabled' do
+        before do
+          stub_feature_flags(optimized_head_tree: false)
+        end
+
+        it 'returns a Tree' do
+          expect(repository.head_tree).to be_an_instance_of(Tree)
+        end
+      end
     end
 
     context 'with a non-existing repository' do
       it 'returns nil' do
-        expect(repository).to receive(:head_commit).and_return(nil)
+        expect(repository).to receive(:root_ref).and_return(nil)
 
         expect(repository.head_tree).to be_nil
       end
+
+      context 'when feature flag "optimized_head_tree" is disabled' do
+        before do
+          stub_feature_flags(optimized_head_tree: false)
+        end
+
+        it 'returns nil' do
+          expect(repository).to receive(:head_commit).and_return(nil)
+
+          expect(repository.head_tree).to be_nil
+        end
+      end
     end
   end
 
@@ -2795,16 +2817,33 @@ def mock_gitaly(second_response)
     let(:pagination_params) { nil }
 
     context 'using a non-existing repository' do
-      before do
-        allow(repository).to receive(:head_commit).and_return(nil)
-      end
+      context 'when feature flag "optimized_head_tree" is enabled' do
+        before do
+          allow(repository).to receive(:root_ref).and_return(nil)
+        end
 
-      it { is_expected.to be_nil }
+        it { is_expected.to be_nil }
 
-      context 'when path is defined' do
-        let(:path) { 'README.md' }
+        context 'when path is defined' do
+          let(:path) { 'README.md' }
+
+          it { is_expected.to be_nil }
+        end
+      end
+
+      context 'when feature flag "optimized_head_tree" is disabled' do
+        before do
+          stub_feature_flags(optimized_head_tree: false)
+          allow(repository).to receive(:head_commit).and_return(nil)
+        end
 
         it { is_expected.to be_nil }
+
+        context 'when path is defined' do
+          let(:path) { 'README.md' }
+
+          it { is_expected.to be_nil }
+        end
       end
     end
 

spec/services/ci/runners/register_runner_service_spec.rb

@@ -47,6 +47,7 @@
         expect(runner.run_untagged).to be true
         expect(runner.active).to be true
         expect(runner.token).not_to eq(registration_token)
+        expect(runner.token).not_to start_with(::Ci::Runner::CREATED_RUNNER_TOKEN_PREFIX)
         expect(runner).to be_instance_type
       end