make the NamedScopeMethods test -actually- test that the scope was defined, and fix the silently broken logic for defining scopes in rails 2.x

lib/aasm/persistence/active_record_persistence.rb

@@ -38,7 +38,7 @@ module AASM
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteState) unless base.method_defined?(:aasm_write_state)
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteStateWithoutPersistence) unless base.method_defined?(:aasm_write_state_without_persistence)
 
-        if base.respond_to?(:scope)
+        if base.respond_to?(:named_scope) || base.respond_to?(:scope)
           base.extend(AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods)
 
           base.class_eval do
@@ -238,7 +238,13 @@ module AASM
       module NamedScopeMethods
         def aasm_state_with_scope name, options = {}
           aasm_state_without_scope name, options
-          self.scope name, :conditions => { "#{table_name}.#{self.aasm_column}" => name.to_s} unless self.respond_to?(name)
+          
+          unless self.respond_to?(name)
+            scope_options = {:conditions => { "#{table_name}.#{self.aasm_column}" => name.to_s}}
+            scope_method = ActiveRecord::VERSION::MAJOR >= 3 ? :scope : :named_scope
+            self.send(scope_method, name, scope_options)
+          end
+          
         end
       end
     end

spec/unit/active_record_persistence_spec.rb

@@ -216,15 +216,15 @@ begin
 
     context "Does not already respond_to? the scope name" do
       it "should add a scope" do
-        NamedScopeExample.should_receive(:scope)
         NamedScopeExample.aasm_state :unknown_scope
+        NamedScopeExample.scopes.keys.should include(:unknown_scope)
       end
     end
 
     context "Already respond_to? the scope name" do
       it "should not add a scope" do
-        NamedScopeExample.should_not_receive(:scope)
         NamedScopeExample.aasm_state :new
+        NamedScopeExample.scopes.keys.should_not include(:new)
       end
     end
   end