rivendell-import 0.7 → 0.8

data/spec/rivendell/import_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe Rivendell::Import do
 
-  describe "#config" do
-    
+  describe ".config" do
+
     context "without argument" do
 
       it "should return Rivendell::Import::Config instance" do
         Rivendell::Import.config.should be_instance_of(Rivendell::Import::Config)
       end
-                                 
+
     end
 
     context "with a block" do
-      
+
       it "should yield block with Config instance" do
         config_instance = Rivendell::Import.config
         Rivendell::Import.should_receive(:config).and_yield(config_instance)
@@ -26,6 +26,41 @@ describe Rivendell::Import do
 
     end
 
+  end
+
+  describe ".establish_connection" do
+
+    before do
+      ActiveRecord::Base.stub :establish_connection
+      ActiveRecord::Migrator.stub :migrate
+    end
+
+    context "when a file is given" do
+
+      let(:file) { '/srv/rivendell/tmp/db.sqlite3' }
+
+      it "should initialize a sqlite database" do
+        ActiveRecord::Base.should_receive(:establish_connection).with({ :adapter => "sqlite3", :database => file })
+        Rivendell::Import.establish_connection file
+      end
+
+    end
+
+    context "when an url is given" do
+
+      let(:url) { 'mysql://import:import@localhost/import' }
+
+      it "should initialize database with given url" do
+        ActiveRecord::Base.should_receive(:establish_connection).with(url)
+        Rivendell::Import.establish_connection url
+      end
+
+    end
+
+    it "should migrate database" do
+      ActiveRecord::Migrator.should_receive(:migrate).with(File.expand_path("../../../db/migrate/", __FILE__), nil)
+      Rivendell::Import.establish_connection
+    end
 
   end
 

data/spec/simplecov-default.rb

@@ -0,0 +1,19 @@
+require 'simplecov'
+
+if ENV['SIMPLECOV_RCOV_OUTPUT']
+  require 'simplecov-rcov'
+
+  class SimpleCov::Formatter::MergedFormatter
+    def format(result)
+      SimpleCov::Formatter::HTMLFormatter.new.format(result)
+      SimpleCov::Formatter::RcovFormatter.new.format(result)
+    end
+  end
+  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+end
+
+SimpleCov.start do
+  add_filter "/spec/"
+  add_filter "/db/"
+  add_filter "/vendor/"
+end

data/spec/spec_helper.rb

@@ -1,8 +1,4 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter "/spec/"
-  add_filter "/db/"
-end
+require 'simplecov-default'
 
 require 'rivendell/import'
 
@@ -12,4 +8,3 @@ Rivendell::Import.logger = ActiveRecord::Base.logger = Logger.new("log/test.log"
 Rivendell::Import.establish_connection "db/test.sqlite3"
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
-