nunit_plugin_spec.rb in rake-funnel-0.21.1

- old
+ new

@@ -1,27 +1,26 @@
 # rubocop:disable RSpec/FilePath
 
-include Rake::Funnel::Support
-
 describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
   before do
     allow(ENV).to receive(:[]).with(described_class::ENV_VAR).and_return(env_var)
-    allow(Which).to receive(:which).and_return(which)
+    allow(Rake::Funnel::Support::Which).to receive(:which).and_return(which)
     allow(Dir).to receive(:glob).and_return([])
     allow(RakeFileUtils).to receive(:mkdir_p)
     allow(Rake).to receive(:rake_output_message)
   end
 
   before do
-    allow(BinaryVersionReader).to receive(:read_from).with(which).and_return(nunit_version)
+    allow(Rake::Funnel::Support::BinaryVersionReader).to receive(:read_from)
+      .with(which).and_return(nunit_version)
   end
 
   describe 'success' do
     let(:env_var) { '/path/to/nunit plugins/nunit' }
     let(:addin_dlls) { [env_var + 'addin.dll'] }
     let(:which) { 'path/to/nunit-console.exe' }
-    let(:nunit_version) { VersionInfo.new(file_version: '1.2.3.4') }
+    let(:nunit_version) { Rake::Funnel::Support::VersionInfo.new(file_version: '1.2.3.4') }
     let(:plugin_version) { nunit_version.file_version.split('.').take(3).join('.') }
 
     before do
       allow(Dir).to receive(:glob).and_return(addin_dlls)
       allow(RakeFileUtils).to receive(:cp)
@@ -51,11 +50,11 @@
         have_received(:rake_output_message)
         .with("Installing TeamCity NUnit addin for version #{plugin_version} in #{which}")
     end
 
     context 'Windows-style path in environment variable',
-            skip: ('Windows Registry not available' unless defined?(::Win32::Registry)) do
+            skip: !Gem.win_platform? do
       let(:env_var) { 'C:\path\to\nunit plugins\nunit-' }
 
       it 'should convert path to Ruby-style' do
         expect(Dir).to have_received(:glob).with(%r{^C:/path/to/nunit plugins/nunit-})
       end
@@ -63,30 +62,30 @@
   end
 
   describe 'failures' do
     let(:env_var) { nil }
     let(:which) { nil }
-    let(:nunit_version) { VersionInfo.new }
+    let(:nunit_version) { Rake::Funnel::Support::VersionInfo.new }
 
     before do
       described_class.setup('nunit-console.exe')
     end
 
     context 'TeamCity plugin path not in environment' do
       let(:env_var) { nil }
 
       it 'should skip reading the version' do
-        expect(BinaryVersionReader).not_to have_received(:read_from)
+        expect(Rake::Funnel::Support::BinaryVersionReader).not_to have_received(:read_from)
       end
     end
 
     context 'NUnit executable not found' do
       let(:env_var) { '/path/to/nunit plugins/nunit' }
       let(:which) { nil }
 
       it 'should skip reading the version' do
-        expect(BinaryVersionReader).not_to have_received(:read_from)
+        expect(Rake::Funnel::Support::BinaryVersionReader).not_to have_received(:read_from)
       end
     end
 
     context 'NUnit executable without version' do
       let(:env_var) { '/path/to/nunit plugins/nunit' }
@@ -104,10 +103,10 @@
     end
 
     context 'plugin for NUnit version not available' do
       let(:env_var) { '/path/to/nunit plugins/nunit' }
       let(:which) { 'path/to/nunit-console.exe' }
-      let(:nunit_version) { VersionInfo.new(file_version: '1.2.3.4') }
+      let(:nunit_version) { Rake::Funnel::Support::VersionInfo.new(file_version: '1.2.3.4') }
 
       it 'should report that the addin version is not available' do
         expect(Rake).to \
           have_received(:rake_output_message)
           .with(/Could not find TeamCity NUnit addin for version 1\.2\.3 in .*#{env_var}$/)