From 03cfce5a3059d4eef119c61e7c01ca7ba25bff76 Mon Sep 17 00:00:00 2001 From: em Date: Tue, 31 Oct 2017 10:09:26 +0100 Subject: [PATCH] fixing integration tests for the new docker driver test, fixing include folders for intellij --- .idea/inspectionProfiles/Project_Default.xml | 1 + docker_sync.iml | 16 +++++++--------- .../dependencies/docker_driver_spec.rb | 9 ++------- spec/lib/docker-sync/project_config_spec.rb | 8 ++++---- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 74f86a67..e2cd8939 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -2,6 +2,7 @@ \ No newline at end of file diff --git a/docker_sync.iml b/docker_sync.iml index 4341ce02..3bff8dce 100644 --- a/docker_sync.iml +++ b/docker_sync.iml @@ -45,14 +45,12 @@ - - - + @@ -60,12 +58,12 @@ - + - - - - + + + + @@ -73,7 +71,7 @@ - + \ No newline at end of file diff --git a/spec/lib/docker-sync/dependencies/docker_driver_spec.rb b/spec/lib/docker-sync/dependencies/docker_driver_spec.rb index 3fdcfd28..a9d9a6d2 100644 --- a/spec/lib/docker-sync/dependencies/docker_driver_spec.rb +++ b/spec/lib/docker-sync/dependencies/docker_driver_spec.rb @@ -23,14 +23,9 @@ expect(described_class).to have_received(:system).with('ps x | grep MacOS | grep -q com.docker.osx.hyperkit.linux') end - it 'checks if Docker is running from /var/lib/docker' do - subject - expect(described_class).to have_received(:system).with('docker info | grep -q "Docker Root Dir: /var/lib/docker"') - end - it 'is memoized' do - expect { 2.times { described_class.docker_for_mac? } }.to change { described_class.instance_variable_defined?(:@docker_for_mac) } - expect(described_class).to have_received(:system).exactly(:twice) + expect { 1.times { described_class.docker_for_mac? } }.to change { described_class.instance_variable_defined?(:@docker_for_mac) } + expect(described_class).to have_received(:system).exactly(:once) end end diff --git a/spec/lib/docker-sync/project_config_spec.rb b/spec/lib/docker-sync/project_config_spec.rb index f74777ac..86491251 100644 --- a/spec/lib/docker-sync/project_config_spec.rb +++ b/spec/lib/docker-sync/project_config_spec.rb @@ -303,13 +303,13 @@ it do use_fixture 'simplest' do if OS.linux? - is_expected.not_to be_unison_required + is_expected.not_to unison_required? else - is_expected.to be_unison_required + is_expected.to unison_required? end end end - it do use_fixture 'rsync' do is_expected.not_to be_unison_required end end - it do use_fixture 'unison' do is_expected.to be_unison_required end end + it do use_fixture 'rsync' do is_expected.not_to unison_required? end end + it do use_fixture 'unison' do is_expected.to unison_required? end end end end