mocked_fixtures 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.0 2008-09-04
+
+* New features:
+  * Added blocks to mock fixture accessors to allow neater customisation of mock objects as they are loaded
+* Refactored hooks for loading mock fixtures on test setup. Much simpler and handles Rails 2.0 and 2.1
+  without load order issues with rspec-rails
+  
 == 0.1.0 2008-09-03
 
 * 1 major enhancement:

data/lib/mocked_fixtures.rb

@@ -9,7 +9,7 @@ require 'mocked_fixtures/version'
 
 if defined?(Spec::Example)
   require 'mocked_fixtures/spec/configuration'
-  Test::Unit::TestCase.mocked_fixtures_mock_framework = :rspec
+#  Test::Unit::TestCase.mock_fixtures_with :rspec
 end
 
 MockedFixtures::SchemaParser.schema_path = RAILS_ROOT + '/db/schema.rb'

data/lib/mocked_fixtures/testcase.rb

@@ -43,71 +43,38 @@ module Test
         table_names.map { |f| File.basename(f).split('.')[0..-2].join('.') }
       end
       
-      # Adds test case setup method to run before each test to load fixture
-      # files and setup mock fixture accessors for test class. This runs before
-      # each test as the test class is recreated each time.
-      def self.method_added_with_mock_fixtures(method)
-        return if @__disable_method_added__
-        @__disable_method_added__ = true
-
-        if method.to_s == 'setup'
-          unless method_defined?(:setup_without_mock_fixtures)
-            alias_method :setup_without_mock_fixtures, :setup
-            define_method(:mock_fixture_setup) do
-              setup_with_mock_fixtures
-              setup_without_mock_fixtures
-            end
-          end
-          alias_method :setup, :mock_fixture_setup
-        end
-        
-        @__disable_method_added__ = false
-        method_added_without_mock_fixtures(method)
-      end
-     
-      class << self
-        alias_method_chain :method_added, :mock_fixtures        
-      end
-     
       # This creates the fixture accessors and retrieves the fixture and creates
       # mock object from it. Mock fixture is then cached.
       def self.setup_mock_fixture_accessors(table_names = nil)
         (table_names || mock_fixture_table_names).each do |table_name|
           table_name = table_name.to_s.tr('.', '_')
-    
-          define_method('mock_' + table_name) do |*fixtures|
-            @mock_fixture_cache ||= {}
-            @mock_fixture_cache[table_name] ||= {}
-            if fixtures.first == :all
-              fixtures = self.class.loaded_mock_fixtures[table_name].keys
-            end           
-            
-            mock_type = self.class.mocked_fixtures_mock_framework
-            
-            instances = fixtures.map do |fixture_name|
-              if fixture = self.class.loaded_mock_fixtures[table_name][fixture_name.to_s]
-                unless model_class = self.class.loaded_mock_fixtures[table_name].send(:model_class)
-                  raise StandardError, "No model class found for table name '#{table_name}'. Specify it explicitly 'set_fixture_class :table_name => 'ClassName'."
-                end
-                
-                @mock_fixture_cache[table_name][fixture_name] ||= MockedFixtures::MockFactory.create_mock(mock_type, model_class, fixture, self)
-              else
-                raise StandardError, "No fixture named '#{fixture_name}' was found for table '#{table_name}'"
-              end
-            end
 
-            instances.size == 1 ? instances.first : instances
-          end
-          
+          class_eval <<-END
+            def mock_#{table_name}(*fixtures, &block)
+              create_mock_fixtures('#{table_name}', *fixtures, &block)
+            end
+          END
         end
-      end
-      
+      end      
+
       def setup_with_mock_fixtures
         fixtures_to_load = self.class.mock_fixture_table_names - self.class.loaded_mock_fixtures.keys
-        return if fixtures_to_load.empty?
-        load_mock_fixtures(fixtures_to_load)
+        load_mock_fixtures(fixtures_to_load) unless fixtures_to_load.empty?
+        setup_without_mock_fixtures
+      end
+      
+      # Aliasing test setup method to get mock fixtures loaded.
+      #
+      # If app is Rails 2.0.x and rspec-rails is loaded before plugin,
+      # when used as gem perhaps, it prevents aliasing setup method,
+      if method_defined?(:setup_with_fixtures)
+        alias_method :setup_without_mock_fixtures, :setup_with_fixtures
+        alias_method :setup_with_fixtures, :setup_with_mock_fixtures
+      else
+        alias_method_chain :setup, :mock_fixtures
       end
-      alias_method :setup, :setup_with_mock_fixtures
+    
+     private
 
       # Loads fixtures to be mocked and cache them in class variable
       def load_mock_fixtures(fixtures_to_load)
@@ -116,6 +83,34 @@ module Test
           fixtures.each { |f| self.class.loaded_mock_fixtures[f.table_name] = f }
         end
       end
+
+      # Create mock fixture objects for fixture names and cache. Pass each
+      # fixture to block, if given, to customize mock object for local use.
+      def create_mock_fixtures(table_name, *fixtures, &block)
+        @mock_fixture_cache ||= {}
+        @mock_fixture_cache[table_name] ||= {}
+        if fixtures.first == :all
+          fixtures = self.class.loaded_mock_fixtures[table_name].keys
+        end
+        
+        mock_type = self.class.mocked_fixtures_mock_framework
+        
+        instances = fixtures.map do |fixture_name|
+          if fixture = self.class.loaded_mock_fixtures[table_name][fixture_name.to_s]
+            unless model_class = self.class.loaded_mock_fixtures[table_name].send(:model_class)
+              raise StandardError, "No model class found for table name '#{table_name}'. Specify it explicitly 'set_fixture_class :table_name => 'ClassName'."
+            end
+            mock_fixture = MockedFixtures::MockFactory.create_mock(mock_type, model_class, fixture, self)
+            @mock_fixture_cache[table_name][fixture_name] ||= mock_fixture
+            yield(mock_fixture) if block_given?
+            mock_fixture
+          else
+            raise StandardError, "No fixture named '#{fixture_name}' was found for table '#{table_name}'"
+          end
+        end
+
+        instances.size == 1 ? instances.first : instances
+      end
     
     end
   end

data/lib/mocked_fixtures/version.rb

@@ -1,7 +1,7 @@
 module MockedFixtures
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/connection_adapters/sqlserver_adapter_spec.rb

@@ -2,33 +2,18 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 begin
   gem 'activerecord-sqlserver-adapter'
+  require 'active_record/connection_adapters/sqlserver_adapter'
   require 'mocked_fixtures/connection_adapters/sqlserver_adapter'
-rescue LoadError
+rescue LoadError, StandardError
   puts 'Testing ActiveRecord SQLServer Adapter skipped'
 end
 
-if defined?(MockedFixtures::ConnectionAdapters::SQLServerAdapter)
-  conn = {
-    :adapter  => 'sqlserver',
-    :host     => 'localhost',
-    :mode     => 'odbc', 
-    :dsn      => 'activerecord_unittest',
-    :database => 'activerecord_unittest',
-    :username => 'rails',
-    :password => nil
-  }
-
-  ActiveRecord::Base.establish_connection(conn)
+if defined?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
 
   ActiveRecord::ConnectionAdapters::SQLServerAdapter.send(:include, MockedFixtures::ConnectionAdapters::SQLServerAdapter)
 
-  require 'resources/schema.rb'
-
   describe MockedFixtures::ConnectionAdapters::SQLServerAdapter do
-    
-    before do
-      ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
-    end
+    connect_db('mssql')    
     
     it "should allow SchemDumper to dump primary key option for pk other than 'id'" do
       schema = StringIO.new
@@ -40,5 +25,7 @@ if defined?(MockedFixtures::ConnectionAdapters::SQLServerAdapter)
     it "should return primary key and sequence" do
       ActiveRecord::Base.connection.pk_and_sequence_for('companies').should == ['cid', nil]
     end
+    
+    disconnect_db
   end
 end

data/spec/mock_fixtures_spec.rb

@@ -7,6 +7,10 @@ describe MockedFixtures::MockFixtures do
     ActiveRecord::Base.connection.disconnect! rescue nil
   end
   
+  after(:all) do    
+    ActiveRecord::Base.connection.reconnect! rescue nil
+  end
+  
   before(:each) do
     @fixture_path = Test::Unit::TestCase.fixture_path
   end  

data/spec/spec_helper.rb

@@ -4,14 +4,26 @@ $:.unshift File.dirname(__FILE__)
 require 'rubygems'
 require 'spec'
 
+vendored_rails = File.dirname(__FILE__) + '/../../../../vendor/rails'
+
+if vendored = File.exists?(vendored_rails)
+  Dir.glob(vendored_rails + "/**/lib").each { |dir| $:.unshift dir }
+else
+  gem 'rails', "=#{ENV['VERSION']}" if ENV['VERSION']
+end
+
+require 'rails/version'
+require 'active_support'
 require 'active_record'
 require 'active_record/fixtures'
-require 'active_support'
+require 'active_record/version'
+
+puts "Using #{vendored ? 'vendored' : 'gem'} Rails version #{Rails::VERSION::STRING} (ActiveRecord version #{ActiveRecord::VERSION::STRING})"
 
 require 'rspec-rails/rspec-rails'
 
-require 'mocked_fixtures/schema_parser'
 require 'mocked_fixtures/testcase'
+require 'mocked_fixtures/schema_parser'
 require 'mocked_fixtures/mock_fixtures'
 require 'mocked_fixtures/mock_factory'
 require 'mocked_fixtures/mock_connection'
@@ -19,9 +31,51 @@ require 'mocked_fixtures/mock_connection'
 require 'resources/company'
 require 'resources/employee'
 
-
 MockedFixtures::SchemaParser.schema_path = File.expand_path(File.dirname(__FILE__) + '/resources/schema.rb')
 
 Test::Unit::TestCase.fixture_path = File.expand_path(File.dirname(__FILE__) + '/resources')
 
+ActiveRecord::Migration.verbose = false
+
+ActiveRecord::Base.configurations['sqlite'] = {
+  :adapter  => 'sqlite3', 
+  :database => ':memory:'
+}
+
+ActiveRecord::Base.configurations['mssql'] = {
+  :adapter  => 'sqlserver',
+  :host     => 'localhost',
+  :mode     => 'odbc', 
+  :dsn      => 'activerecord_unittest',
+  :database => 'activerecord_unittest',
+  :username => 'rails',
+  :password => nil
+}
+
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['sqlite'])
+
+module SpecHelpers
+  def self.included(base)
+    base.extend ClassMethods
+  end 
+    
+  module ClassMethods
+    def connect_db(config)
+      before(:all) do
+        ActiveRecord::Base.connection.disconnect! rescue nil
+        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[config])      
+        require 'resources/schema'
+      end
+    end
+    
+    def disconnect_db
+      after(:all) do
+        ActiveRecord::Base.connection.disconnect! rescue nil
+      end
+    end
+  end
+end
 
+Spec::Runner.configure do |config|
+  config.include SpecHelpers
+end

data/spec/testcase_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Test::Unit::TestCase, "extended with mocked_fixtures" do
+describe 'Test::Unit::TestCase', "when extended with mocked_fixtures" do
   
   def klass
     Test::Unit::TestCase
@@ -24,7 +24,7 @@ describe Test::Unit::TestCase, "extended with mocked_fixtures" do
   end
  
   it "should return all fixture table names" do
-    klass.all_fixture_table_names.should == ['employees', 'companies']
+    klass.all_fixture_table_names.should include('employees', 'companies')
   end
  
   describe "global mock fixtures" do
@@ -36,11 +36,11 @@ describe Test::Unit::TestCase, "extended with mocked_fixtures" do
     
     it "should include all fixtures if equals :all" do
       klass.global_mock_fixtures = :all
-      klass.mock_fixture_table_names.should == ['employees', 'companies']
+      klass.mock_fixture_table_names.should include('employees', 'companies')
     end
   end
   
-  describe "mocked fixture accessor" do     
+  describe "mocked fixture accessors" do
     mock_fixtures :companies, :employees    
     
     before(:all) do
@@ -63,11 +63,29 @@ describe Test::Unit::TestCase, "extended with mocked_fixtures" do
       lambda { mock_companies(:non_fixture) }.should raise_error(StandardError, /No fixture named 'non_fixture'/)
     end
     
-    #it "should execute block on mock object requested" do
-    #  employee = mock_employees(:adam) do |employee|
-    #    employee.stub!(:last_name).and_return(employee.last_name.upcase)
-    #  end      
-    #  employee.last_name.should == "MEEHAN"
-    #end
+    it "should call block on mock object requested" do
+      employee = mock_employees(:adam) do |e|
+        e.stub!(:last_name).and_return('MEEHAN')
+      end
+      employee.last_name.should == "MEEHAN"
+    end
+    
+    it "should call block on all mock objects requested" do
+      employees = mock_employees(:adam, :jane) do |e|
+        e.stub!(:last_name).and_return('same')
+      end
+      employees.all? {|e| e.last_name.should == "same" }
+    end
+  end
+  
+  describe "regular fixtures" do
+    fixtures :companies
+    
+    connect_db('sqlite')
+    disconnect_db
+    
+    it "should be loaded" do
+      companies(:mega_corp).should_not be_nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mocked_fixtures
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 00:00:00 +10:00
+date: 2008-09-04 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency