Permalink
Browse files

Merge branch 'master' of git@github.com:railsmachine/moonshine

  • Loading branch information...
2 parents d62881b + 630fab4 commit 0a26870a35fa862be5fc40fad41aeab0950045a1 @jnewland jnewland committed Apr 27, 2009
Showing with 3 additions and 2 deletions.
  1. +1 −1 lib/moonshine/manifest.rb
  2. +2 −1 test/moonshine/manifest_test.rb
@@ -29,7 +29,7 @@ class Moonshine::Manifest < ShadowPuppet::Manifest
# end
def self.plugin(name = nil)
if name.is_a?(Symbol)
- path = File.join(rails_root, 'vendor', 'plugins', name.to_s, 'moonshine', 'init.rb')
+ path = File.join(rails_root, 'vendor', 'plugins', 'moonshine_' + name.to_s, 'moonshine', 'init.rb')
else
path = name
end
@@ -32,7 +32,8 @@ def test_app_templates_override_moonshine_templates
end
def test_loads_plugins
- File.expects(:read).returns("""
+ @manifest = Moonshine::Manifest.new
+ File.expects(:read).with(File.expand_path(File.join(@manifest.rails_root, 'vendor', 'plugins', 'moonshine_iptables', 'moonshine','init.rb'))).returns("""
configure(:eval => true)
module EvalTest

0 comments on commit 0a26870

Please sign in to comment.