Merge branch 'sh-fix-check-spec' into 'master'

Make spec/lib/gitlab/build/check_spec.rb work when `ee` value is set

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7236

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Dmytro Makovey <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: balasankarc

spec/lib/gitlab/build/check_spec.rb

@@ -24,6 +24,7 @@
         end
 
         it 'when env variable is not set' do
+          stub_env_var('ee', nil)
           stub_is_ee_version(false)
           stub_is_auto_deploy(false)
           expect(described_class.is_ee?).to be_falsy
@@ -32,11 +33,13 @@
 
       describe 'GITLAB_VERSION variable' do
         it 'when GITLAB_VERSION ends with -ee' do
+          stub_env_var('ee', nil)
           stub_env_var('GITLAB_VERSION', 'foo-ee')
           expect(described_class.is_ee?).to be_truthy
         end
 
         it 'when GITLAB_VERSION does not end with -ee' do
+          stub_env_var('ee', nil)
           stub_env_var('GITLAB_VERSION', 'foo')
           stub_is_auto_deploy(false)
           expect(described_class.is_ee?).to be_falsy

spec/lib/gitlab/build/info/components_spec.rb

@@ -30,16 +30,16 @@
         # On stable branches and tags, generate-facts will not populate version facts
         # So, the content of the VERSION file will be used as-is.
         it 'returns tag with v prefix' do
-          allow(File).to receive(:exist?).with(/gitlab-rails_version/).and_return(false)
+          allow(File).to receive(:exist?).with(/gitlab-rails.*version/).and_return(false)
           allow(File).to receive(:read).with(/VERSION/).and_return('15.7.0')
           expect(described_class.ref).to eq('v15.7.0')
         end
       end
 
       context 'when on feature branches' do
         it 'returns commit SHA without any prefix' do
-          allow(File).to receive(:exist?).with(/gitlab-rails_version/).and_return(true)
-          allow(File).to receive(:read).with(/gitlab-rails_version/).and_return('arandomcommit')
+          allow(File).to receive(:exist?).with(/gitlab-rails.*version/).and_return(true)
+          allow(File).to receive(:read).with(/gitlab-rails.*version/).and_return('arandomcommit')
           expect(described_class.ref).to eq('arandomcommit')
         end
       end
@@ -50,16 +50,16 @@
         # On stable branches and tags, generate-facts will not populate version facts
         # So, whatever is on VERSION file, will be used.
         it 'returns tag without v prefix' do
-          allow(File).to receive(:exist?).with(/gitlab-rails_version/).and_return(false)
+          allow(File).to receive(:exist?).with(/gitlab-rails.*version/).and_return(false)
           allow(File).to receive(:read).with(/VERSION/).and_return('15.7.0')
           expect(described_class.ref(prepend_version: false)).to eq('15.7.0')
         end
       end
 
       context 'when on feature branches' do
         it 'returns commit SHA without any prefix' do
-          allow(File).to receive(:exist?).with(/gitlab-rails_version/).and_return(true)
-          allow(File).to receive(:read).with(/gitlab-rails_version/).and_return('arandomcommit')
+          allow(File).to receive(:exist?).with(/gitlab-rails.*version/).and_return(true)
+          allow(File).to receive(:read).with(/gitlab-rails.*version/).and_return('arandomcommit')
           expect(described_class.ref(prepend_version: false)).to eq('arandomcommit')
         end
       end