aasm 3.0.24 → 3.0.25

data/spec/unit/localizer_spec.rb

@@ -10,12 +10,12 @@ class LocalizerTestModel < ActiveRecord::Base
 
   attr_accessor :aasm_state
 
-  aasm_initial_state :opened
-  aasm_state :opened
-  aasm_state :closed
-
-  aasm_event :close
-  aasm_event :open
+  aasm do
+    state :opened, :initial => true
+    state :closed
+    event :close
+    event :open
+  end
 end
 
 describe 'localized state names' do
@@ -52,13 +52,13 @@ describe AASM::Localizer, "new style" do
   let (:foo_opened) { LocalizerTestModel.new }
   let (:foo_closed) { LocalizerTestModel.new.tap { |x| x.aasm_state = :closed  } }
 
-  context 'aasm_human_state' do
+  context 'aasm.human_state' do
     it 'should return translated state value' do
-      foo_opened.aasm_human_state.should == "It's open now!"
+      foo_opened.aasm.human_state.should == "It's open now!"
     end
 
     it 'should return humanized value if not localized' do
-      foo_closed.aasm_human_state.should == "Closed"
+      foo_closed.aasm.human_state.should == "Closed"
     end
   end
 
@@ -87,13 +87,13 @@ describe AASM::Localizer, "deprecated style" do
   let (:foo_opened) { LocalizerTestModel.new }
   let (:foo_closed) { LocalizerTestModel.new.tap { |x| x.aasm_state = :closed  } }
 
-  context 'aasm_human_state' do
+  context 'aasm.human_state' do
     it 'should return translated state value' do
-      foo_opened.aasm_human_state.should == "It's open now!"
+      foo_opened.aasm.human_state.should == "It's open now!"
     end
 
     it 'should return humanized value if not localized' do
-      foo_closed.aasm_human_state.should == "Closed"
+      foo_closed.aasm.human_state.should == "Closed"
     end
   end
 

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -24,24 +24,24 @@ describe "instance methods" do
   end
 
   it "should return the initial state when new and the aasm field is nil" do
-    gate.aasm_current_state.should == :opened
+    gate.aasm.current_state.should == :opened
   end
 
   it "should return the aasm column when new and the aasm field is not nil" do
     gate.aasm_state = "closed"
-    gate.aasm_current_state.should == :closed
+    gate.aasm.current_state.should == :closed
   end
 
   it "should return the aasm column when not new and the aasm_column is not nil" do
     gate.stub(:new_record?).and_return(false)
     gate.aasm_state = "state"
-    gate.aasm_current_state.should == :state
+    gate.aasm.current_state.should == :state
   end
 
   it "should allow a nil state" do
     gate.stub(:new_record?).and_return(false)
     gate.aasm_state = nil
-    gate.aasm_current_state.should be_nil
+    gate.aasm.current_state.should be_nil
   end
 
   it "should call aasm_ensure_initial_state on validation before create" do
@@ -49,6 +49,11 @@ describe "instance methods" do
     gate.valid?
   end
 
+  it "should call aasm_ensure_initial_state before create, even if skipping validations" do
+    gate.should_receive(:aasm_ensure_initial_state).and_return(true)
+    gate.save(:validate => false)
+  end
+
   it "should not call aasm_ensure_initial_state on validation before update" do
     gate.stub(:new_record?).and_return(false)
     gate.should_not_receive(:aasm_ensure_initial_state)
@@ -59,15 +64,11 @@ end
 
 describe 'subclasses' do
   it "should have the same states as its parent class" do
-    Derivate.aasm_states.should == Simple.aasm_states
+    DerivateNewDsl.aasm.states.should == SimpleNewDsl.aasm.states
   end
 
   it "should have the same events as its parent class" do
-    Derivate.aasm_events.should == Simple.aasm_events
-  end
-
-  it "should have the same column as its parent class" do
-    Derivate.aasm_column.should == :status
+    DerivateNewDsl.aasm.events.should == SimpleNewDsl.aasm.events
   end
 
   it "should have the same column as its parent even for the new dsl" do
@@ -76,26 +77,7 @@ describe 'subclasses' do
   end
 end
 
-describe "named scopes with the old DSL" do
-
-  context "Does not already respond_to? the scope name" do
-    it "should add a scope" do
-      Simple.should respond_to(:unknown_scope)
-      SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation).should be_true
-    end
-  end
-
-  context "Already respond_to? the scope name" do
-    it "should not add a scope" do
-      Simple.should respond_to(:new)
-      Simple.new.class.should == Simple
-    end
-  end
-
-end
-
 describe "named scopes with the new DSL" do
-
   context "Does not already respond_to? the scope name" do
     it "should add a scope" do
       SimpleNewDsl.should respond_to(:unknown_scope)
@@ -119,8 +101,8 @@ end
 describe 'initial states' do
 
   it 'should support conditions' do
-    Thief.new(:skilled => true).aasm_current_state.should == :rich
-    Thief.new(:skilled => false).aasm_current_state.should == :jailed
+    Thief.new(:skilled => true).aasm.current_state.should == :rich
+    Thief.new(:skilled => false).aasm.current_state.should == :jailed
   end
 end
 

data/spec/unit/persistence/mongoid_persistance_spec.rb

@@ -1,131 +1,152 @@
 describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') do
 # describe 'mongoid' do
 
-  before(:all) do
+  begin
     require 'mongoid'
     require 'logger'
     require 'spec_helper'
-    Dir[File.dirname(__FILE__) + "/../../models/mongoid/*.rb"].sort.each { |f| require File.expand_path(f) }
 
-    # if you want to see the statements while running the spec enable the following line
-    # Mongoid.logger = Logger.new(STDERR)
+    before(:all) do
+      Dir[File.dirname(__FILE__) + "/../../models/mongoid/*.rb"].sort.each { |f| require File.expand_path(f) }
 
-    DATABASE_NAME = "mongoid_#{Process.pid}"
+      # if you want to see the statements while running the spec enable the following line
+      # Mongoid.logger = Logger.new(STDERR)
 
-    Mongoid.configure do |config|
-      config.connect_to DATABASE_NAME
+      DATABASE_NAME = "mongoid_#{Process.pid}"
+
+      Mongoid.configure do |config|
+        config.connect_to DATABASE_NAME
+      end
     end
-  end
 
-  after do
-    Mongoid.purge!
-  end
+    after do
+      Mongoid.purge!
+    end
 
-  describe "named scopes with the old DSL" do
+    describe "named scopes with the old DSL" do
 
-    context "Does not already respond_to? the scope name" do
-      it "should add a scope" do
-        SimpleMongoid.should respond_to(:unknown_scope)
-        SimpleMongoid.unknown_scope.class.should == Mongoid::Criteria
+      context "Does not already respond_to? the scope name" do
+        it "should add a scope" do
+          SimpleMongoid.should respond_to(:unknown_scope)
+          SimpleMongoid.unknown_scope.class.should == Mongoid::Criteria
+        end
       end
-    end
 
-    context "Already respond_to? the scope name" do
-      it "should not add a scope" do
-        SimpleMongoid.should respond_to(:new)
-        SimpleMongoid.new.class.should == SimpleMongoid
+      context "Already respond_to? the scope name" do
+        it "should not add a scope" do
+          SimpleMongoid.should respond_to(:new)
+          SimpleMongoid.new.class.should == SimpleMongoid
+        end
       end
+
     end
 
-  end
+    describe "named scopes with the new DSL" do
 
-  describe "named scopes with the new DSL" do
+      context "Does not already respond_to? the scope name" do
+        it "should add a scope" do
+          SimpleNewDslMongoid.should respond_to(:unknown_scope)
+          SimpleNewDslMongoid.unknown_scope.class.should == Mongoid::Criteria
+        end
+      end
 
-    context "Does not already respond_to? the scope name" do
-      it "should add a scope" do
-        SimpleNewDslMongoid.should respond_to(:unknown_scope)
-        SimpleNewDslMongoid.unknown_scope.class.should == Mongoid::Criteria
+      context "Already respond_to? the scope name" do
+        it "should not add a scope" do
+          SimpleNewDslMongoid.should respond_to(:new)
+          SimpleNewDslMongoid.new.class.should == SimpleNewDslMongoid
+        end
       end
-    end
 
-    context "Already respond_to? the scope name" do
-      it "should not add a scope" do
-        SimpleNewDslMongoid.should respond_to(:new)
-        SimpleNewDslMongoid.new.class.should == SimpleNewDslMongoid
+      it "does not create scopes if requested" do
+        NoScopeMongoid.should_not respond_to(:ignored_scope)
       end
-    end
 
-    it "does not create scopes if requested" do
-      NoScopeMongoid.should_not respond_to(:ignored_scope)
     end
 
-  end
+    describe "#find_in_state" do
 
-  describe "#find_in_state" do
+      let!(:model)    { SimpleNewDslMongoid.create!(:status => :unknown_scope) }
+      let!(:model_id) { model._id }
 
-    let!(:model)    { SimpleNewDslMongoid.create!(:status => :unknown_scope) }
-    let!(:model_id) { model._id }
+      it "should respond to method" do
+        SimpleNewDslMongoid.should respond_to(:find_in_state)
+      end
 
-    it "should respond to method" do
-      SimpleNewDslMongoid.should respond_to(:find_in_state)
-    end
+      it "should find the model when given the correct scope and model id" do
+        SimpleNewDslMongoid.find_in_state(model_id, 'unknown_scope').class.should == SimpleNewDslMongoid
+        SimpleNewDslMongoid.find_in_state(model_id, 'unknown_scope').should == model
+      end
 
-    it "should find the model when given the correct scope and model id" do
-      SimpleNewDslMongoid.find_in_state(model_id, 'unknown_scope').class.should == SimpleNewDslMongoid
-      SimpleNewDslMongoid.find_in_state(model_id, 'unknown_scope').should == model
-    end
+      it "should raise DocumentNotFound error when given incorrect scope" do
+        expect {SimpleNewDslMongoid.find_in_state(model_id, 'new')}.to raise_error Mongoid::Errors::DocumentNotFound
+      end
 
-    it "should raise DocumentNotFound error when given incorrect scope" do
-      expect {SimpleNewDslMongoid.find_in_state(model_id, 'new')}.to raise_error Mongoid::Errors::DocumentNotFound
-    end
+      it "should raise DocumentNotFound error when given incorrect model id" do
+        expect {SimpleNewDslMongoid.find_in_state('bad_id', 'unknown_scope')}.to raise_error Mongoid::Errors::DocumentNotFound
+      end
 
-    it "should raise DocumentNotFound error when given incorrect model id" do
-      expect {SimpleNewDslMongoid.find_in_state('bad_id', 'unknown_scope')}.to raise_error Mongoid::Errors::DocumentNotFound
     end
 
-  end
+    describe "#count_in_state" do
 
-  describe "#count_in_state" do
+      before do
+        3.times { SimpleNewDslMongoid.create!(:status => :unknown_scope) }
+      end
 
-    before do
-      3.times { SimpleNewDslMongoid.create!(:status => :unknown_scope) }
-    end
+      it "should respond to method" do
+        SimpleNewDslMongoid.should respond_to(:count_in_state)
+      end
 
-    it "should respond to method" do
-      SimpleNewDslMongoid.should respond_to(:count_in_state)
-    end
+      it "should return n for a scope with n records persisted" do
+        SimpleNewDslMongoid.count_in_state('unknown_scope').class.should == Fixnum
+        SimpleNewDslMongoid.count_in_state('unknown_scope').should == 3
+      end
 
-    it "should return n for a scope with n records persisted" do
-      SimpleNewDslMongoid.count_in_state('unknown_scope').class.should == Fixnum
-      SimpleNewDslMongoid.count_in_state('unknown_scope').should == 3
-    end
+      it "should return zero for a scope without records persisted" do
+        SimpleNewDslMongoid.count_in_state('new').class.should == Fixnum
+        SimpleNewDslMongoid.count_in_state('new').should == 0
+      end
 
-    it "should return zero for a scope without records persisted" do
-      SimpleNewDslMongoid.count_in_state('new').class.should == Fixnum
-      SimpleNewDslMongoid.count_in_state('new').should == 0
     end
 
-  end
+    describe "#with_state_scope" do
 
-  describe "#with_state_scope" do
+      before do
+        3.times { SimpleNewDslMongoid.create!(:status => :unknown_scope) }
+        2.times { SimpleNewDslMongoid.create!(:status => :new) }
+      end
 
-    before do
-      3.times { SimpleNewDslMongoid.create!(:status => :unknown_scope) }
-      2.times { SimpleNewDslMongoid.create!(:status => :new) }
-    end
+      it "should respond to method" do
+        SimpleNewDslMongoid.should respond_to(:with_state_scope)
+      end
+
+      it "should correctly process block" do
+        SimpleNewDslMongoid.with_state_scope('unknown_scope') do
+          SimpleNewDslMongoid.count
+        end.should == 3
+        SimpleNewDslMongoid.with_state_scope('new') do
+          SimpleNewDslMongoid.count
+        end.should == 2
+      end
 
-    it "should respond to method" do
-      SimpleNewDslMongoid.should respond_to(:with_state_scope)
     end
 
-    it "should correctly process block" do
-      SimpleNewDslMongoid.with_state_scope('unknown_scope') do
-        SimpleNewDslMongoid.count
-      end.should == 3
-      SimpleNewDslMongoid.with_state_scope('new') do
-        SimpleNewDslMongoid.count
-      end.should == 2
+
+    describe "instance methods" do
+      let(:simple) {SimpleNewDslMongoid.new}
+
+      it "should call aasm_ensure_initial_state on validation before create" do
+        simple.should_receive(:aasm_ensure_initial_state).and_return(true)
+        simple.valid?
+      end
+
+      it "should call aasm_ensure_initial_state before create, even if skipping validations" do
+        simple.should_receive(:aasm_ensure_initial_state).and_return(true)
+        simple.save(:validate => false)
+      end
     end
 
+  rescue LoadError
+    puts "Not running Mongoid specs because mongoid gem if not installed!!!"
   end
 end

data/spec/unit/simple_example_spec.rb

@@ -20,8 +20,7 @@ describe 'state machine' do
   let(:payment) {Payment.new}
 
   it 'starts with an initial state' do
-    payment.aasm_current_state.should == :initialised
-    # payment.aasm.current_state.should == :initialised # not yet supported
+    payment.aasm.current_state.should == :initialised
     payment.should respond_to(:initialised?)
     payment.should be_initialised
   end

data/spec/unit/subclassing_spec.rb

@@ -4,18 +4,18 @@ describe 'subclassing' do
   let(:son) {Son.new}
 
   it 'should have the parent states' do
-    Foo.aasm_states.each do |state|
-      FooTwo.aasm_states.should include(state)
+    Foo.aasm.states.each do |state|
+      FooTwo.aasm.states.should include(state)
     end
-    Baz.aasm_states.should == Bar.aasm_states
+    Baz.aasm.states.should == Bar.aasm.states
   end
 
   it 'should not add the child states to the parent machine' do
-    Foo.aasm_states.should_not include(:foo)
+    Foo.aasm.states.should_not include(:foo)
   end
 
   it "should have the same events as its parent" do
-    Baz.aasm_events.should == Bar.aasm_events
+    Baz.aasm.events.should == Bar.aasm.events
   end
 
   it 'should know how to respond to `may_add_details?`' do
@@ -24,8 +24,8 @@ describe 'subclassing' do
 
   it 'should not break if I call Son#update_state' do
     son.update_state
-    son.aasm_current_state.should == :pending_details_confirmation
+    son.aasm.current_state.should == :pending_details_confirmation
   end
-  
+
 end
 

data/spec/unit/transition_spec.rb

@@ -187,13 +187,13 @@ describe AASM::Transition, '- when executing the transition with an :on_transtio
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object')
 
-    obj.class.class_eval do
-      define_method(:test) {|*args| 'success'}
+    def obj.test(args)
+      "arg1: #{args[:arg1]} arg2: #{args[:arg2]}"
     end
 
     return_value = st.execute(obj, args)
 
-    return_value.should == 'success'
+    return_value.should == 'arg1: 1 arg2: 2'
   end
 
   it 'should NOT pass args if the target method does NOT accept them' do
@@ -202,8 +202,8 @@ describe AASM::Transition, '- when executing the transition with an :on_transtio
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object')
 
-    obj.class.class_eval do
-      define_method(:test) {|*args| 'success'}
+    def obj.test
+      'success'
     end
 
     return_value = st.execute(obj, args)