From c7a3de0a4c7a18d51ea2a584c300ea6cd4d94e3f Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 3 Feb 2012 16:22:03 +0100 Subject: [PATCH] Normalize tests --- test/dummy.rb | 41 +++++++++++++++++++++++++++ test/test_helper.rb | 42 ++++++---------------------- test/unit/tabs/block_builder_test.rb | 19 ++----------- test/unit/tabs/builder_test.rb | 20 ++----------- test/unit/tabs/tabs_builder_test.rb | 23 ++------------- test/unit/tabs_test.rb | 31 +++++--------------- 6 files changed, 64 insertions(+), 112 deletions(-) create mode 100644 test/dummy.rb diff --git a/test/dummy.rb b/test/dummy.rb new file mode 100644 index 0000000..5f2e852 --- /dev/null +++ b/test/dummy.rb @@ -0,0 +1,41 @@ +ENV["RAILS_ENV"] = "test" + +require "active_support" +require "action_controller" +require "rails/railtie" + + +class Dummy + Routes = ActionDispatch::Routing::RouteSet.new + Routes.draw do + match ':controller(/:action(/:id))' + end +end + +ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views') +ActionController::Base.send :include, Dummy::Routes.url_helpers + +class ActiveSupport::TestCase + + setup do + @routes = Dummy::Routes + end + + + def controller + @controller_proxy ||= ControllerProxy.new(@controller) + end + + class ControllerProxy + def initialize(controller) + @controller = controller + end + def method_missing(method, *args) + @controller.instance_eval do + m = method(method) + m.call(*args) + end + end + end + +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 076d794..4a6ef70 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,44 +1,20 @@ require 'test/unit' require 'mocha' - -ENV["RAILS_ENV"] = "test" - -require "active_support" -require "action_controller" -require "rails/railtie" +require 'dummy' $:.unshift File.expand_path('../../lib', __FILE__) require 'tabs_on_rails' -ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views') - -TabsOnRails::Routes = ActionDispatch::Routing::RouteSet.new -TabsOnRails::Routes.draw do - match ':controller(/:action(/:id))' -end - -ActionController::Base.send :include, TabsOnRails::Routes.url_helpers class ActiveSupport::TestCase - setup do - @routes = TabsOnRails::Routes - end - - - def controller - @controller_proxy ||= ControllerProxy.new(@controller) - end - - class ControllerProxy - def initialize(controller) - @controller = controller - end - def method_missing(method, *args) - @controller.instance_eval do - m = method(method) - m.call(*args) - end + def current_tab(namespace) + case namespace + when nil, :default + :dashboard + when :foospace + :footab + else + :elsetab end end - end diff --git a/test/unit/tabs/block_builder_test.rb b/test/unit/tabs/block_builder_test.rb index 1cd672a..ab98a55 100644 --- a/test/unit/tabs/block_builder_test.rb +++ b/test/unit/tabs/block_builder_test.rb @@ -1,21 +1,6 @@ require 'test_helper' class BlockBuilderTest < ActionView::TestCase - tests TabsOnRails::ActionController::HelperMethods - - include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper - - def current_tab(namespace) - case namespace - when nil, :default - :dashboard - when :foospace - :footab - else - :elsetab - end - end class BlockBuilder < TabsOnRails::Tabs::TabsBuilder def tab_for(tab, name, options, item_options = {}, &block) @@ -26,9 +11,9 @@ def tab_for(tab, name, options, item_options = {}, &block) end end + def setup - @klass = BlockBuilder - @builder = @klass.new(self) + @builder = BlockBuilder.new(self) end def test_tab_for_with_block diff --git a/test/unit/tabs/builder_test.rb b/test/unit/tabs/builder_test.rb index 1164def..fbcb8a0 100644 --- a/test/unit/tabs/builder_test.rb +++ b/test/unit/tabs/builder_test.rb @@ -1,25 +1,9 @@ require 'test_helper' -class BuilderTest < ActiveSupport::TestCase - - Template = Class.new do - include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper - - def current_tab(namespace) - case namespace - when nil, :default - :dashboard - when :foospace - :footab - else - :elsetab - end - end - end +class BuilderTest < ActionView::TestCase def setup - @template = Template.new + @template = self @builder = TabsOnRails::Tabs::Builder.new(@template) end diff --git a/test/unit/tabs/tabs_builder_test.rb b/test/unit/tabs/tabs_builder_test.rb index a6b8b28..29378d6 100644 --- a/test/unit/tabs/tabs_builder_test.rb +++ b/test/unit/tabs/tabs_builder_test.rb @@ -1,30 +1,13 @@ require 'test_helper' class TabsBuilderTest < ActionView::TestCase - tests TabsOnRails::ActionController::HelperMethods - - include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper - - def current_tab(namespace) - case namespace - when nil, :default - :dashboard - when :foospace - :footab - else - :elsetab - end - end - def setup - @klass = TabsOnRails::Tabs::TabsBuilder - @builder = @klass.new(self) + @builder = TabsOnRails::Tabs::TabsBuilder.new(self) end - def test_should_extend_builder - assert_equal TabsOnRails::Tabs::Builder, @klass.superclass + def test_inherits_from_builder + assert_equal TabsOnRails::Tabs::Builder, TabsOnRails::Tabs::TabsBuilder.superclass end diff --git a/test/unit/tabs_test.rb b/test/unit/tabs_test.rb index bfb3706..744a3be 100644 --- a/test/unit/tabs_test.rb +++ b/test/unit/tabs_test.rb @@ -1,22 +1,6 @@ require 'test_helper' -class TabsTest < ActiveSupport::TestCase - - Template = Class.new do - include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper - - def current_tab(namespace) - case namespace - when nil, :default - :dashboard - when :foospace - :footab - else - :elsetab - end - end - end +class TabsTest < ActionView::TestCase OpenZeroArgsBuilder = Class.new(TabsOnRails::Tabs::Builder) do def open_tabs @@ -41,21 +25,20 @@ def tab_for(tab, name, options, item_options = {}, &block) def setup - @template = Template.new - @klass = TabsOnRails::Tabs - @tabs = @klass.new(@template) + @template = self + @tabs = TabsOnRails::Tabs.new(@template) end def test_initialize - @tabs = @klass.new(@template) + @tabs = TabsOnRails::Tabs.new(@template) assert_equal @template, @tabs.instance_variable_get(:"@context") assert_instance_of TabsOnRails::Tabs::TabsBuilder, @tabs.instance_variable_get(:"@builder") end def test_initialize_with_option_builder builder = Class.new(TabsOnRails::Tabs::TabsBuilder) - @tabs = @klass.new(@template, :builder => builder) + @tabs = TabsOnRails::Tabs.new(@template, :builder => builder) assert_equal @template, @tabs.instance_variable_get(:"@context") assert_instance_of builder, @tabs.instance_variable_get(:"@builder") end @@ -70,7 +53,7 @@ def test_open_tabs_with_options end def test_open_tabs_should_ignore_options_if_arity_is_zero - @tabs = @klass.new(@template, :builder => OpenZeroArgsBuilder) + @tabs = TabsOnRails::Tabs.new(@template, :builder => OpenZeroArgsBuilder) assert_nothing_raised do assert_equal '', @tabs.close_tabs(:class => "foo") end