Skip to content

Commit

Permalink
trying to fix travis builds / rspec tests
Browse files Browse the repository at this point in the history
  • Loading branch information
EugenMayer committed Sep 30, 2018
1 parent 9ffd23b commit 39d62e9
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/docker-sync/dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def self.ensure_all_for_mac!(config)
unless Fswatch.available?
Fswatch.ensure!
puts "please restart docker sync so the installation of fswatch takes effect"
exit 1
raise(UNSUPPORTED_OPERATING_SYSTEM)
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/docker-sync/watch_strategy/fswatch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def initialize(sync_name, options)
exit 1
end
puts "please restart docker sync so the installation of fswatch takes effect"
exit 1
raise(UNSUPPORTED_OPERATING_SYSTEM)
end

end
Expand Down
1 change: 1 addition & 0 deletions spec/integration/native-osx_strategy_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'spec_helper'
require 'fileutils'
require 'os'
require 'rspec/bash'

RSpec.describe 'native_osx strategy', command_execution: :allowed, if: OS.mac? do
include Rspec::Bash
Expand Down
2 changes: 2 additions & 0 deletions spec/integration/version_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require 'spec_helper'
require 'docker-sync/upgrade_check'
require 'rspec/bash'

RSpec.describe '--version', command_execution: :allowed do
include Rspec::Bash

Expand Down
1 change: 1 addition & 0 deletions spec/lib/docker-sync/dependencies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
describe '.ensure_all_for_mac!(config)' do
before do
allow(described_class::PackageManager).to receive(:ensure!)
#allow(DockerSync::Dependencies::Fswatch).to receive(:ensure!).and_return(true)
allow(described_class::Docker).to receive(:ensure!)
end

Expand Down
4 changes: 4 additions & 0 deletions spec/lib/docker-sync/project_config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
let(:default_watch_strategy) { OS.linux? ? 'dummy' : 'unison' }

subject { described_class.new }
before do
allow(DockerSync::Dependencies::Docker::Driver).to receive(:system).with('pgrep -q com.docker.hyperkit').and_return(true)
end

describe '#initialize' do

describe 'minimum configuration with defaults' do
it 'loads simplest config' do
use_fixture 'simplest' do
Expand Down

0 comments on commit 39d62e9

Please sign in to comment.