Don't depend on test load order

This commit is contained in:
Takashi Kokubun 2017-02-07 22:55:30 +09:00
parent 554dab0708
commit 23d0880a95
3 changed files with 42 additions and 39 deletions

View File

@ -2,9 +2,9 @@ require 'test_helper'
require 'mocks/article'
require 'action_pack/version'
require 'template_test_helper'
class PrettyTemplateTest < Haml::TestCase
TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
TEMPLATES = %w{ very_basic standard helpers
whitespace_handling original_engine list helpful
silent_script tag_parsing just_stuff partials
@ -21,7 +21,7 @@ class PrettyTemplateTest < Haml::TestCase
def create_base
vars = { 'article' => Article.new, 'foo' => 'value one' }
base = ActionView::Base.new(TEMPLATE_PATH, vars)
base = ActionView::Base.new(TemplateTestHelper::TEMPLATE_PATH, vars)
# This is needed by RJS in (at least) Rails 3
base.instance_variable_set(:@template, base)

View File

@ -2,44 +2,9 @@ require 'test_helper'
require 'mocks/article'
require 'action_pack/version'
module Haml::Filters::Test
include Haml::Filters::Base
def render(text)
"TESTING HAHAHAHA!"
end
end
module Haml::Helpers
def test_partial(name, locals = {})
Haml::Engine.new(File.read(File.join(TemplateTest::TEMPLATE_PATH, "_#{name}.haml")), Haml::Template.options).render(self, locals)
end
end
class Egocentic
def method_missing(*args)
self
end
end
class DummyController
attr_accessor :logger
def initialize
@logger = Egocentic.new
end
def self.controller_path
''
end
def controller_path
''
end
end
require 'template_test_helper'
class TemplateTest < Haml::TestCase
TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
TEMPLATES = %w{ very_basic standard helpers
whitespace_handling original_engine list helpful
silent_script tag_parsing just_stuff partials
@ -56,7 +21,7 @@ class TemplateTest < Haml::TestCase
def create_base
vars = { 'article' => Article.new, 'foo' => 'value one' }
base = ActionView::Base.new(TEMPLATE_PATH, vars)
base = ActionView::Base.new(TemplateTestHelper::TEMPLATE_PATH, vars)
# This is needed by RJS in (at least) Rails 3
base.instance_variable_set(:@template, base)

View File

@ -0,0 +1,38 @@
module TemplateTestHelper
TEMPLATE_PATH = File.join(__dir__, "templates")
end
module Haml::Filters::Test
include Haml::Filters::Base
def render(text)
"TESTING HAHAHAHA!"
end
end
module Haml::Helpers
def test_partial(name, locals = {})
Haml::Engine.new(File.read(File.join(TemplateTestHelper::TEMPLATE_PATH, "_#{name}.haml")), Haml::Template.options).render(self, locals)
end
end
class Egocentic
def method_missing(*args)
self
end
end
class DummyController
attr_accessor :logger
def initialize
@logger = Egocentic.new
end
def self.controller_path
''
end
def controller_path
''
end
end