Fix test specs (#778)

EugenMayer · Aug 22, 2021 · 702b717 · 702b717
1 parent 339f47f
commit 702b717
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/spec/integration/native-osx_strategy_spec.rb b/spec/integration/native-osx_strategy_spec.rb
@@ -7,11 +7,12 @@
   include Rspec::Bash
 
   let(:env)                  { create_stubbed_env }
+  let(:dir)                  { Dir.tmpdir }
   let(:bin)                  { File.expand_path(File.join(__dir__, '..', '..', 'bin', 'docker-sync')) }
   let(:config_file_template) { File.expand_path(File.join(__dir__, '..', '..', 'spec', 'fixtures', 'native_osx', 'docker-sync.yml')) }
-  let(:config_file_path)     { File.join(env.dir, 'docker-sync.yml') }
+  let(:config_file_path)     { File.join(dir, 'docker-sync.yml') }
   let(:host_app_template)    { 'spec/fixtures/app_skeleton' }
-  let(:host_app_path)        { File.join(env.dir, File.basename(host_app_template)) }
+  let(:host_app_path)        { File.join(dir, File.basename(host_app_template)) }
   let(:test_env_vars)        { { 'DOCKER_SYNC_SKIP_UPGRADE' => 'true', 'DOCKER_SYNC_SKIP_UPDATE' => 'true', 'DOCKER_SYNC_SKIP_DEPENDENCIES_CHECK' => 'true' } }
 
   before :all do
@@ -21,8 +22,8 @@
 
   describe 'start' do
     around(:each) do |example|
-      FileUtils.cp_r([host_app_template, config_file_template], env.dir)
-      FileUtils.chdir(env.dir) do
+      FileUtils.cp_r([host_app_template, config_file_template], dir)
+      FileUtils.chdir(dir) do
         replace_in_file(config_file_path, '{{HOST_APP_PATH}}', "'#{host_app_path}'")
         _stdout, stderr, status = env.execute_inline("#{bin} start", test_env_vars)
         raise stderr unless status.success?

diff --git a/spec/lib/docker-sync/project_config_spec.rb b/spec/lib/docker-sync/project_config_spec.rb
@@ -2,12 +2,28 @@
 require 'docker-sync/config/project_config'
 
 RSpec.describe DockerSync::ProjectConfig do
-  let(:default_sync_strategy) { OS.linux? ? 'native' : 'unison' }
-  let(:default_watch_strategy) { OS.linux? ? 'dummy' : 'unison' }
+  let(:default_sync_strategy)  do 
+    if OS.linux?
+      'native' 
+    elsif OS.mac?
+      'native_osx'
+    else
+      'unison'
+    end
+  end
+  let(:default_watch_strategy) do 
+    if OS.linux?
+      'dummy'
+    elsif OS.mac?
+      'remotelogs'
+    else
+      'unison'
+    end
+  end
 
   subject { described_class.new }
   before do
-    allow(DockerSync::Dependencies::Docker::Driver).to receive(:system).with('pgrep -q com.docker.hyperkit').and_return(true)
+    allow(DockerSync::Environment).to receive(:system).with('pgrep -q com.docker.hyperkit').and_return(true)
   end
 
   describe '#initialize' do
@@ -305,9 +321,10 @@
 
   describe '#unison_required?' do
     it do
-      allow(DockerSync::Dependencies::Docker::Driver).to receive(:system).with('pgrep -q com.docker.hyperkit').and_return(true)
+      allow(DockerSync::Environment).to receive(:system).with('pgrep -q com.docker.hyperkit').and_return(true)
+
       use_fixture 'simplest' do
-        if OS.linux?
+        if OS.linux? || OS.mac?
           is_expected.not_to be_unison_required
         else
           is_expected.to be_unison_required