From cf18161abc03b70a5a5ffe667eaa34520ce4df49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Bo=CC=88ttger?= Date: Wed, 31 Aug 2011 23:49:09 +0200 Subject: [PATCH] using real database connections for testing to reduce dependency on Rails version (previously mocked away ActiveRecord connection, which is not used in Rails 3.1 anymore) --- .gitignore | 2 + aasm.gemspec | 3 +- spec/database.yml | 3 + spec/schema.rb | 21 +++++ spec/spec_helper.rb | 7 ++ spec/unit/active_record_persistence_spec.rb | 91 ++++++++++----------- 6 files changed, 76 insertions(+), 51 deletions(-) create mode 100644 spec/database.yml create mode 100644 spec/schema.rb diff --git a/.gitignore b/.gitignore index 94da6d5..5b38be0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ coverage pkg rdoc Gemfile.lock +spec/debug.log +spec/*.db diff --git a/aasm.gemspec b/aasm.gemspec index 3321a95..10a2b9a 100644 --- a/aasm.gemspec +++ b/aasm.gemspec @@ -11,12 +11,13 @@ Gem::Specification.new do |s| s.summary = %q{State machine mixin for Ruby objects} s.description = %q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.} - s.add_dependency 'activerecord' #, '~> 3.0' + s.add_dependency 'activerecord' s.add_development_dependency 'rake' s.add_development_dependency 'sdoc' s.add_development_dependency 'rspec', '~> 2.0' s.add_development_dependency 'rr' s.add_development_dependency 'shoulda' + s.add_development_dependency 'sqlite3' s.add_development_dependency 'minitest' s.files = `git ls-files`.split("\n") diff --git a/spec/database.yml b/spec/database.yml new file mode 100644 index 0000000..edafcb3 --- /dev/null +++ b/spec/database.yml @@ -0,0 +1,3 @@ +sqlite3: + adapter: sqlite3 + database: spec/aasm.sqlite3.db diff --git a/spec/schema.rb b/spec/schema.rb new file mode 100644 index 0000000..1c3cdbd --- /dev/null +++ b/spec/schema.rb @@ -0,0 +1,21 @@ +ActiveRecord::Schema.define(:version => 0) do + + create_table :gates, :force => true do |t| + end + + create_table :readers, :force => true do |t| + end + + create_table :writers, :force => true do |t| + end + + create_table :transients, :force => true do |t| + end + + create_table :simples, :force => true do |t| + end + + create_table :thieves, :force => true do |t| + end + +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1379db5..74fef42 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,3 +8,10 @@ require 'rspec/autorun' RSpec.configure do |config| end + +def load_schema + config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) + ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") + ActiveRecord::Base.establish_connection(config['sqlite3']) + load(File.dirname(__FILE__) + "/schema.rb") +end diff --git a/spec/unit/active_record_persistence_spec.rb b/spec/unit/active_record_persistence_spec.rb index 64afa9a..0fd365e 100644 --- a/spec/unit/active_record_persistence_spec.rb +++ b/spec/unit/active_record_persistence_spec.rb @@ -2,20 +2,18 @@ begin require 'rubygems' require 'active_record' require 'logger' - + + load_schema + ActiveRecord::Base.logger = Logger.new(STDERR) - # A dummy class for mocking the activerecord connection class - class Connection - end - - class FooBar < ActiveRecord::Base + class Gate < ActiveRecord::Base include AASM # Fake this column for testing purposes attr_accessor :aasm_state - aasm_state :open + aasm_state :opened aasm_state :closed aasm_event :view do @@ -23,36 +21,37 @@ begin end end - class Fi < ActiveRecord::Base + class Reader < ActiveRecord::Base def aasm_read_state "fi" end include AASM end - class Fo < ActiveRecord::Base + class Writer < ActiveRecord::Base def aasm_write_state(state) "fo" end include AASM end - class Fum < ActiveRecord::Base + class Transient < ActiveRecord::Base def aasm_write_state_without_persistence(state) "fum" end include AASM end - class June < ActiveRecord::Base + class Simple < ActiveRecord::Base include AASM aasm_column :status end - class Beaver < June + class Derivate < Simple end class Thief < ActiveRecord::Base + set_table_name "thieves" include AASM aasm_initial_state Proc.new { |thief| thief.skilled ? :rich : :jailed } aasm_state :rich @@ -69,9 +68,9 @@ begin end end - describe FooBar, "class methods" do + describe Gate, "class methods" do before(:each) do - @klass = FooBar + @klass = Gate end it_should_behave_like "aasm model" it "should include AASM::Persistence::ActiveRecordPersistence::ReadState" do @@ -85,9 +84,9 @@ begin end end - describe Fi, "class methods" do + describe Reader, "class methods" do before(:each) do - @klass = Fi + @klass = Reader end it_should_behave_like "aasm model" it "should not include AASM::Persistence::ActiveRecordPersistence::ReadState" do @@ -101,9 +100,9 @@ begin end end - describe Fo, "class methods" do + describe Writer, "class methods" do before(:each) do - @klass = Fo + @klass = Writer end it_should_behave_like "aasm model" it "should include AASM::Persistence::ActiveRecordPersistence::ReadState" do @@ -117,9 +116,9 @@ begin end end - describe Fum, "class methods" do + describe Transient, "class methods" do before(:each) do - @klass = Fum + @klass = Transient end it_should_behave_like "aasm model" it "should include AASM::Persistence::ActiveRecordPersistence::ReadState" do @@ -133,61 +132,57 @@ begin end end - describe FooBar, "instance methods" do - before(:each) do - connection = mock(Connection, :columns => []) - FooBar.stub!(:connection).and_return(connection) - end + describe Gate, "instance methods" do it "should respond to aasm read state when not previously defined" do - FooBar.new.should respond_to(:aasm_read_state) + Gate.new.should respond_to(:aasm_read_state) end it "should respond to aasm write state when not previously defined" do - FooBar.new.should respond_to(:aasm_write_state) + Gate.new.should respond_to(:aasm_write_state) end it "should respond to aasm write state without persistence when not previously defined" do - FooBar.new.should respond_to(:aasm_write_state_without_persistence) + Gate.new.should respond_to(:aasm_write_state_without_persistence) end it "should return the initial state when new and the aasm field is nil" do - FooBar.new.aasm_current_state.should == :open + Gate.new.aasm_current_state.should == :opened end it "should return the aasm column when new and the aasm field is not nil" do - foo = FooBar.new + foo = Gate.new foo.aasm_state = "closed" foo.aasm_current_state.should == :closed end it "should return the aasm column when not new and the aasm_column is not nil" do - foo = FooBar.new + foo = Gate.new foo.stub!(:new_record?).and_return(false) foo.aasm_state = "state" foo.aasm_current_state.should == :state end it "should allow a nil state" do - foo = FooBar.new + foo = Gate.new foo.stub!(:new_record?).and_return(false) foo.aasm_state = nil foo.aasm_current_state.should be_nil end it "should have aasm_ensure_initial_state" do - foo = FooBar.new + foo = Gate.new foo.send :aasm_ensure_initial_state end it "should call aasm_ensure_initial_state on validation before create" do - foo = FooBar.new + foo = Gate.new foo.should_receive(:aasm_ensure_initial_state).and_return(true) foo.valid? end it "should call aasm_ensure_initial_state on validation before create" do - foo = FooBar.new + foo = Gate.new foo.stub!(:new_record?).and_return(false) foo.should_not_receive(:aasm_ensure_initial_state) foo.valid? @@ -195,45 +190,41 @@ begin end - describe 'Beavers' do + describe 'Derivates' do it "should have the same states as it's parent" do - Beaver.aasm_states.should == June.aasm_states + Derivate.aasm_states.should == Simple.aasm_states end it "should have the same events as it's parent" do - Beaver.aasm_events.should == June.aasm_events + Derivate.aasm_events.should == Simple.aasm_events end it "should have the same column as it's parent" do - Beaver.aasm_column.should == :status + Derivate.aasm_column.should == :status end end describe AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods do - class NamedScopeExample < ActiveRecord::Base - include AASM - end context "Does not already respond_to? the scope name" do it "should add a scope" do - NamedScopeExample.aasm_state :unknown_scope - NamedScopeExample.scopes.keys.should include(:unknown_scope) + Simple.should_not respond_to(:unknown_scope) + Simple.aasm_state :unknown_scope + Simple.should respond_to(:unknown_scope) + Simple.unknown_scope.class.should == ActiveRecord::Relation end end context "Already respond_to? the scope name" do it "should not add a scope" do - NamedScopeExample.aasm_state :new - NamedScopeExample.scopes.keys.should_not include(:new) + Simple.aasm_state :new + Simple.should respond_to(:new) + Simple.new.class.should == Simple end end end describe 'Thieves' do - before(:each) do - connection = mock(Connection, :columns => []) - Thief.stub!(:connection).and_return(connection) - end it 'should be rich if they\'re skilled' do Thief.new(:skilled => true).aasm_current_state.should == :rich