! spec-only problem where a method was aliased twice.

floere · Jul 19, 2010 · bff6a6e · bff6a6e
1 parent bb6a9ea
commit bff6a6e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/gem/lib/rails2/lib/view_models/base.rb b/gem/lib/rails2/lib/view_models/base.rb
@@ -21,10 +21,12 @@ class << self
       #
       # TODO extract into module
       #
-      alias old_add_template_helper add_template_helper
-      def add_template_helper helper_module
-        include helper_module
-        old_add_template_helper helper_module
+      unless instance_methods.include?('old_add_template_helper')
+        alias old_add_template_helper add_template_helper
+        def add_template_helper helper_module
+          include helper_module
+          old_add_template_helper helper_module
+        end
       end
 
       # Sets the view format and tries to render the given options.

diff --git a/gem/spec/rails2/integration/integration_spec.rb b/gem/spec/rails2/integration/integration_spec.rb
@@ -1,6 +1,6 @@
 this = File.dirname(__FILE__)
 
-require File.join(this, '../spec_helper')
+require File.join(this, '/../spec_helper')
 
 require File.join(this, 'models/subclass')
 require File.join(this, 'models/sub_subclass')

diff --git a/gem/spec/rails2/lib/extensions/active_record_spec.rb b/gem/spec/rails2/lib/extensions/active_record_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
 
 describe ViewModels::Extensions::ActiveRecord do
 

diff --git a/gem/spec/rails2/lib/extensions/model_reader_spec.rb b/gem/spec/rails2/lib/extensions/model_reader_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
 
 describe ViewModels::Extensions::ModelReader do
 

diff --git a/gem/spec/rails2/lib/helpers/collection_spec.rb b/gem/spec/rails2/lib/helpers/collection_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
 
 describe ViewModels::Helpers::Mapping::Collection do
   include ViewModels::Helpers::Mapping

diff --git a/gem/spec/rails2/lib/helpers/view_spec.rb b/gem/spec/rails2/lib/helpers/view_spec.rb
@@ -2,7 +2,7 @@
 
 describe ViewModels::Helpers::View do
 
-  class TestClass; end
+  class TestClass < ActionView::Base; end
 
   describe "including it" do
     it "should include all the view helpers" do

diff --git a/gem/spec/rails2/lib/view_models/view_spec.rb b/gem/spec/rails2/lib/view_models/view_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
 
 describe ViewModels::View do
 

diff --git a/gem/spec/rails2/spec_helper.rb b/gem/spec/rails2/spec_helper.rb
@@ -1,10 +1,6 @@
 require 'rubygems'
 
-# require 'bundler'
-# Bundler.require :default, :rails2
-
 require 'spec'
-
 require 'action_controller'
 
 require File.join(File.dirname(__FILE__), '/../../lib/rails2/init')