Also run OSS specs during NON-OSS spec run (#1078)

.drone.yml

@@ -6,7 +6,7 @@ pipeline:
       - bundle install --path bundler
       - bundle exec rubocop --fail-level A -S --format c --parallel
       - bundle exec rspec spec/
-      - PHAROS_NON_OSS=true bundle exec rspec non-oss/spec/
+      - PHAROS_NON_OSS=true bundle exec rspec spec/ non-oss/spec/
   test-shellcheck:
     image: koalaman/shellcheck-alpine:latest
     commands:

lib/pharos/version.rb

@@ -6,4 +6,8 @@ module Pharos
   def self.version
     VERSION + "+oss"
   end
+
+  def self.oss?
+    true
+  end
 end

non-oss/pharos_pro/version.rb

@@ -4,4 +4,8 @@ module Pharos
   def self.version
     VERSION
   end
+
+  def self.oss?
+    false
+  end
 end

non-oss/spec/pharos_pro/commands/version_command_spec.rb

@@ -1,4 +1,4 @@
-describe Pharos::VersionCommand do
+describe Pharos::VersionCommand, unless: Pharos.oss? do
   subject { described_class.new('') }
 
   it 'outputs pharos version' do

non-oss/spec/pharos_pro/phases/validate_version_spec.rb

@@ -1,11 +1,14 @@
-require 'pharos/phases/validate_version'
-require 'pharos_pro/phases/validate_version'
+describe "Pharos::Phases::ValidateVersion", unless: Pharos.oss? do
+  before :all do
+    Pharos::Phases.send(:remove_const, :ValidateVersion) if Pharos::Phases.const_defined?(:ValidateVersion)
+    load File.expand_path(File.join(__dir__, '../../../../lib/pharos/phases/validate_version.rb'))
+    load File.expand_path(File.join(__dir__, '../../../pharos_pro/phases/validate_version.rb'))
+  end
 
-describe Pharos::Phases::ValidateVersion do
   let(:host) { Pharos::Configuration::Host.new(address: '192.0.2.1', role: 'master') }
   let(:network_config) { {} }
   let(:config) { Pharos::Config.new(hosts: [host]) }
-  subject { described_class.new(host, config: config) }
+  subject { Pharos::Phases::ValidateVersion.new(host, config: config) }
 
   describe '#validate_version' do
     it 'allows re-up for stable releases' do

spec/pharos/phases/validate_version_spec.rb

@@ -1,12 +1,15 @@
-require 'pharos/phases/validate_version'
+describe "Pharos::Phases::ValidateVersion", if: Pharos.oss? do
+  before :all do
+    Pharos::Phases.send(:remove_const, :ValidateVersion) if Pharos::Phases.const_defined?(:ValidateVersion)
+    load File.expand_path(File.join(__dir__, '../../../lib/pharos/phases/validate_version.rb'))
+  end
 
-describe Pharos::Phases::ValidateVersion do
   let(:host) { Pharos::Configuration::Host.new(address: '192.0.2.1', role: 'master') }
   let(:network_config) { {} }
   let(:config) { Pharos::Config.new(hosts: [host]) }
   let(:ssh) { instance_double(Pharos::Transport::SSH) }
   let(:cluster_context) { Hash.new }
-  subject { described_class.new(host, config: config, cluster_context: cluster_context) }
+  subject { Pharos::Phases::ValidateVersion.new(host, config: config, cluster_context: cluster_context) }
 
   before do
     allow(host).to receive(:transport).and_return(ssh)

spec/pharos/version_command_spec.rb

@@ -1,4 +1,4 @@
-describe Pharos::VersionCommand do
+describe Pharos::VersionCommand, if: Pharos.oss? do
   subject { described_class.new('') }
 
   it 'outputs version with +oss' do