Use class methods for VersionCheck

All of these methods are stateless, there was no point to have them as
instance methods.

Mostly this allows us to remove an `allow_any_instance_of` usage.

2 files changed, 9 insertions, 8 deletions

diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb
index c29dfb01381..8572a13055c 100644
--- a/spec/features/help_pages_spec.rb
+++ b/spec/features/help_pages_spec.rb
@@ -54,9 +54,10 @@ describe 'Help Pages' do
 
   context 'in a production environment with version check enabled', :js do
     before do
-      allow(Rails.env).to receive(:production?) { true }
       stub_application_setting(version_check_enabled: true)
-      allow_any_instance_of(VersionCheck).to receive(:url) { '/version-check-url' }
+
+      allow(Rails.env).to receive(:production?).and_return(true)
+      allow(VersionCheck).to receive(:url).and_return('/version-check-url')
 
       sign_in(create(:user))
       visit help_path
diff --git a/spec/helpers/version_check_helper_spec.rb b/spec/helpers/version_check_helper_spec.rb
index 9d4e34abef5..bfec7ad4bba 100644
--- a/spec/helpers/version_check_helper_spec.rb
+++ b/spec/helpers/version_check_helper_spec.rb
@@ -13,21 +13,21 @@ describe VersionCheckHelper do
       before do
         allow(Rails.env).to receive(:production?) { true }
         allow(Gitlab::CurrentSettings.current_application_settings).to receive(:version_check_enabled) { true }
-        allow_any_instance_of(VersionCheck).to receive(:url) { 'https://version.host.com/check.svg?gitlab_info=xxx' }
-
-        @image_tag = helper.version_status_badge
+        allow(VersionCheck).to receive(:url) { 'https://version.host.com/check.svg?gitlab_info=xxx' }
       end
 
       it 'should return an image tag' do
-        expect(@image_tag).to match(/^<img/)
+        expect(helper.version_status_badge).to start_with('<img')
       end
 
       it 'should have a js prefixed css class' do
-        expect(@image_tag).to match(/class="js-version-status-badge lazy"/)
+        expect(helper.version_status_badge)
+          .to match(/class="js-version-status-badge lazy"/)
       end
 
       it 'should have a VersionCheck url as the src' do
-        expect(@image_tag).to match(%r{src="https://version\.host\.com/check\.svg\?gitlab_info=xxx"})
+        expect(helper.version_status_badge)
+          .to include(%{src="https://version.host.com/check.svg?gitlab_info=xxx"})
       end
     end
   end