Merge pull request #35 from huginn/fix/spec-runner-ci-compat

Fix SpecRunner CI compatibility

Author: knu

lib/huginn_agent/patches/coverage.rb

@@ -1,13 +1,16 @@
 require 'simplecov'
 
 if !ENV['COVERAGE']
-  require 'coveralls'
-  module Coveralls
-    module Configuration
-      def self.root
-	File.expand_path(File.join(Dir.pwd, '../..'))
+  begin
+    require 'coveralls'
+    module Coveralls
+      module Configuration
+        def self.root
+          File.expand_path(File.join(Dir.pwd, '../..'))
+        end
       end
     end
+  rescue LoadError
   end
 end
 

lib/huginn_agent/spec_runner.rb

@@ -37,13 +37,15 @@ def bundle
         if !File.exist?('.env')
           shell_out "cp .env.example .env"
         end
-        shell_out "bundle install --without development production -j 4", 'Installing ruby gems ...'
+        shell_out "bundle config set --local without 'development production'"
+        shell_out 'bundle install -j 4', 'Installing ruby gems ...'
       end
 
     end
 
     def database
       Dir.chdir('spec/huginn') do
+        remove_schema
         shell_out('bundle exec rake db:create db:migrate', 'Creating database ...')
       end
     end
@@ -76,5 +78,10 @@ def shell_out(command, message = nil, streaming_output = false)
         fail
       end
     end
+
+    private
+    def remove_schema
+      File.delete('db/schema.rb') if File.exist?('db/schema.rb')
+    end
   end
 end

spec/lib/huginn_agent/spec_runner_spec.rb

@@ -34,4 +34,37 @@ class Bundler; def self.with_unbundled_env; yield end end
 
     end
   end
+
+  context '#bundle' do
+    before do
+      allow(Dir).to receive(:chdir).with('spec/huginn').and_yield
+      allow(File).to receive(:exist?).and_call_original
+    end
+
+    it 'uses bundle config instead of --without' do
+      allow(File).to receive(:exist?).with('.env').and_return(false)
+
+      expect(runner).to receive(:shell_out).with("cp .env.example .env").ordered
+      expect(runner).to receive(:shell_out).with("bundle config set --local without 'development production'").ordered
+      expect(runner).to receive(:shell_out).with('bundle install -j 4', 'Installing ruby gems ...').ordered
+
+      runner.bundle
+    end
+  end
+
+  context '#database' do
+    before do
+      allow(Dir).to receive(:chdir).with('spec/huginn').and_yield
+      allow(File).to receive(:exist?).and_call_original
+    end
+
+    it 'removes a generated schema before migrating' do
+      allow(File).to receive(:exist?).with('db/schema.rb').and_return(true)
+
+      expect(File).to receive(:delete).with('db/schema.rb').ordered
+      expect(runner).to receive(:shell_out).with('bundle exec rake db:create db:migrate', 'Creating database ...').ordered
+
+      runner.database
+    end
+  end
 end