Skip to content

Commit

Permalink
Update to latest dependencies versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@bosko
bosko committed Aug 25, 2013
1 parent 2fd0d69 commit 71b47f8
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 78 deletions.
58 changes: 33 additions & 25 deletions Gemfile.lock
View file
Expand Up @@ -8,32 +8,40 @@ PATH
GEM
remote: http://rubygems.org/
specs:
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.4)
diff-lcs (1.1.3)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.13)
builder (3.1.4)
diff-lcs (1.2.4)
erubis (2.7.0)
i18n (0.6.1)
multi_json (1.7.3)
rake (10.0.3)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
i18n (0.6.5)
minitest (4.7.5)
multi_json (1.7.9)
rake (10.1.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
thread_safe (0.1.2)
atomic
tzinfo (0.3.37)

PLATFORMS
Expand Down
24 changes: 13 additions & 11 deletions spec/rmre/generator_spec.rb
View file
Expand Up @@ -2,21 +2,23 @@

module Rmre
describe Generator do
let(:settings) do |sett|
sett = {:db => {:adapter => 'some_adapter',
:database => 'db',
:username => 'user',
:password => 'pass'},
:out_path => File.join(Dir.tmpdir, 'gne-test'),
:include => ['incl1_', 'incl2_'],
:inflections => [{plural: ["(.*)_des$", '\1_des'], singular: ["(.*)_des$", '\1_des']}]
let(:settings) do
{ db: {adapter: 'some_adapter',
database: 'db',
username: 'user',
password: 'pass'},
out_path: File.join(Dir.tmpdir, 'gne-test'),
include: ['incl1_', 'incl2_'],
inflections: [{plural: ["(.*)_des$", '\1_des'], singular: ["(.*)_des$", '\1_des']}]
}
end

let(:generator) do |gen|
let(:connection) do
double("db_connection", columns: [])
end

let(:generator) do
gen = Generator.new(settings[:db], settings[:out_path], settings[:include], settings[:inflections])
connection = double("db_connection")
connection.stub(:columns).and_return([])
gen.stub(:connection).and_return(connection)
gen
end
Expand Down
70 changes: 28 additions & 42 deletions spec/rmre/migrator_spec.rb
View file
Expand Up @@ -2,52 +2,38 @@

module Rmre
describe Migrator do
let(:src_connection) do |src_con|
src_con = double("source_connection")
end

let(:tgt_connection) do |tgt_con|
tgt_con = double("target_connection")
end

let(:src_db_opts) do |opts|
opts = { :adapter => "fake_adapter", :database => "source_db" }
end

let(:tgt_db_opts) do |opts|
opts = { :adapter => "fake_adapter", :database => "target_db" }
end

let(:id_column) do |col|
let(:src_connection) { double("source_connection") }
let(:tgt_connection) { tgt_con = double("target_connection") }
let(:src_db_opts) { { adapter: "fake_adapter", database: "source_db" } }
let(:tgt_db_opts) { { adapter: "fake_adapter", database: "target_db" } }
let(:id_column) do
col = double("id_column")
col.stub!(:name).and_return("id")
col.stub!(:null).and_return(false)
col.stub!(:default).and_return(nil)
col.stub!(:type).and_return("integer")
col.stub(:name).and_return("id")
col.stub(:null).and_return(false)
col.stub(:default).and_return(nil)
col.stub(:type).and_return("integer")
col
end

let(:name_column) do |col|
let(:name_column) do
col = double("name_column")
col.stub!(:name).and_return("name")
col.stub!(:null).and_return(false)
col.stub!(:default).and_return(nil)
col.stub!(:type).and_return("integer")
col.stub(:name).and_return("name")
col.stub(:null).and_return(false)
col.stub(:default).and_return(nil)
col.stub(:type).and_return("integer")
col
end

let(:table) do |tbl|
let(:table) do
tbl = double("created_table")
tbl.stub!(:column)
tbl.stub(:column)
tbl
end

before(:each) do
Source::Db.stub!(:establish_connection).and_return(true)
Source::Db.stub!(:connection).and_return(src_connection)
Source::Db.stub(:establish_connection).and_return(true)
Source::Db.stub(:connection).and_return(src_connection)

Target::Db.stub!(:establish_connection).and_return(true)
Target::Db.stub!(:connection).and_return(tgt_connection)
Target::Db.stub(:establish_connection).and_return(true)
Target::Db.stub(:connection).and_return(tgt_connection)
end

context "initialization" do
Expand All @@ -67,11 +53,11 @@ module Rmre
context "copying tables" do
before(:each) do
src_connection.stub(:tables).and_return %w{parent_table child_table}
src_connection.stub!(:columns).and_return([id_column, name_column])
src_connection.stub!(:primary_key).and_return("id")
src_connection.stub(:columns).and_return([id_column, name_column])
src_connection.stub(:primary_key).and_return("id")

@migrator = Migrator.new(src_db_opts, tgt_db_opts)
@migrator.stub!(:copy_data)
@migrator.stub(:copy_data)
end

it "copies all tables if they do not exist" do
Expand Down Expand Up @@ -111,7 +97,7 @@ module Rmre
context "copying tables with 'skip existing' turned on" do
before(:each) do
src_connection.stub(:tables).and_return %w{parent_table child_table}
src_connection.stub!(:columns).and_return([id_column, name_column])
src_connection.stub(:columns).and_return([id_column, name_column])

@migrator = Migrator.new(src_db_opts, tgt_db_opts, {:skip_existing => true})
end
Expand All @@ -131,8 +117,8 @@ module Rmre
context "Rails copy mode" do
before(:each) do
@migrator = Migrator.new(src_db_opts, tgt_db_opts)
src_connection.stub!(:primary_key).and_return("id")
tgt_connection.stub!(:adapter_name).and_return("fake adapter")
src_connection.stub(:primary_key).and_return("id")
tgt_connection.stub(:adapter_name).and_return("fake adapter")
end

it "does not explicitely create ID column" do
Expand All @@ -153,8 +139,8 @@ module Rmre
context "non-Rails copy mode" do
before(:each) do
@migrator = Migrator.new(src_db_opts, tgt_db_opts, {:rails_copy_mode => false})
tgt_connection.stub!(:adapter_name).times.and_return("fake adapter")
src_connection.stub!(:primary_key).and_return("primaryIdColumn")
tgt_connection.stub(:adapter_name).times.and_return("fake adapter")
src_connection.stub(:primary_key).and_return("primaryIdColumn")
end

it "explicitely creates ID column" do
Expand Down

0 comments on commit 71b47f8

Please sign in to comment.