Skip to content

Commit

Permalink
Merge pull request #23 from floehopper/master
Browse files Browse the repository at this point in the history
test_soup_path method is unintentionally being run as a test.

If Vanilla::TestHelper is going to be usable with `Test::Unit` or `MiniTest`, it shouldn't have method names starting with `test_`.
  • Loading branch information
lazyatom committed Feb 13, 2012
2 parents ce891ee + 9b7963d commit e7273eb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/vanilla/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ def app(klass=Vanilla.apps.first)
# to the application's soup without actually affecting the
# app's content.
config.soups ||= []
config.soups.unshift test_soup_path
config.soups.unshift temp_soup_path
end
@__app = klass.new
end
@__app
end

def vanilla_setup
FileUtils.mkdir_p(test_soup_path)
FileUtils.mkdir_p(temp_soup_path)
end

def vanilla_reset
Expand All @@ -49,12 +49,12 @@ def create_snip(params)
app.soup << params
end

def test_soup_path
def temp_soup_path
File.expand_path(File.join(Dir.tmpdir, "soup"))
end

def vanilla_teardown
FileUtils.rm_rf(test_soup_path)
FileUtils.rm_rf(temp_soup_path)
end

def stub_app_soup(*snips)
Expand Down

0 comments on commit e7273eb

Please sign in to comment.