buildr 1.4.12-x86-mswin32 → 1.4.13-x86-mswin32

data/spec/core/common_spec.rb

@@ -98,7 +98,7 @@ describe Buildr.method(:download) do
   before do
     @content = 'we has download!'
     @http = mock('http')
-    @http.stub!(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
+    @http.stub(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
   end
 
   def tasks()
@@ -595,13 +595,14 @@ end
 describe Buildr::Options, 'proxy.exclude' do
   before do
     options.proxy.http = 'http://myproxy:8080'
+    options.proxy.exclude.clear
     @domain = 'domain'
     @host = "host.#{@domain}"
     @uri = URI("http://#{@host}")
     @no_proxy_args = [@host, 80]
     @proxy_args = @no_proxy_args + ['myproxy', 8080, nil, nil]
     @http = mock('http')
-    @http.stub!(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
+    @http.stub(:request).and_return(Net::HTTPNotModified.new(nil, nil, nil))
   end
 
   it 'should be an array' do

data/spec/core/test_spec.rb

@@ -322,8 +322,8 @@ describe Buildr::TestTask, 'with passing tests' do
       define 'foo' do
         test.using(:junit)
         test.instance_eval do
-          @framework.stub!(:tests).and_return(['PassingTest1', 'PassingTest2'])
-          @framework.stub!(:run).and_return(['PassingTest1', 'PassingTest2'])
+          @framework.stub(:tests).and_return(['PassingTest1', 'PassingTest2'])
+          @framework.stub(:run).and_return(['PassingTest1', 'PassingTest2'])
         end
       end
       project('foo').test
@@ -367,8 +367,8 @@ describe Buildr::TestTask, 'with failed test' do
       define 'foo' do
         test.using(:junit)
         test.instance_eval do
-          @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest'])
-          @framework.stub!(:run).and_return(['PassingTest'])
+          @framework.stub(:tests).and_return(['FailingTest', 'PassingTest'])
+          @framework.stub(:run).and_return(['PassingTest'])
         end
       end
       project('foo').test
@@ -633,8 +633,8 @@ describe Buildr::TestTask, '#invoke' do
     @test_task ||= define('foo') {
       test.using(:junit)
       test.instance_eval do
-        @framework.stub!(:tests).and_return(['PassingTest'])
-        @framework.stub!(:run).and_return(['PassingTest'])
+        @framework.stub(:tests).and_return(['PassingTest'])
+        @framework.stub(:run).and_return(['PassingTest'])
       end
     }.test
   end
@@ -844,10 +844,10 @@ describe 'test rule' do
   it 'should reset tasks to specific pattern' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
       define 'bar' do
         test.using(:junit)
-        test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+        test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
       end
     end
     task('test:something').invoke
@@ -860,7 +860,7 @@ describe 'test rule' do
   it 'should apply *name* pattern' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['prefix-something-suffix']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['prefix-something-suffix']) }
     end
     task('test:something').invoke
     project('foo').test.tests.should include('prefix-something-suffix')
@@ -869,7 +869,7 @@ describe 'test rule' do
   it 'should not apply *name* pattern if asterisks used' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['prefix-something', 'prefix-something-suffix']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['prefix-something', 'prefix-something-suffix']) }
     end
     task('test:*something').invoke
     project('foo').test.tests.should include('prefix-something')
@@ -879,7 +879,7 @@ describe 'test rule' do
   it 'should accept multiple tasks separated by commas' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['foo', 'bar', 'baz']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['foo', 'bar', 'baz']) }
     end
     task('test:foo,bar').invoke
     project('foo').test.tests.should include('foo')
@@ -899,7 +899,7 @@ describe 'test rule' do
   it 'should execute the named tests even if the test task is not needed' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
     end
     touch_last_successful_test_run project('foo').test
     task('test:something').invoke
@@ -909,7 +909,7 @@ describe 'test rule' do
   it 'should not execute excluded tests' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
     end
     task('test:*,-nothing').invoke
     project('foo').test.tests.should include('something')
@@ -932,7 +932,7 @@ describe 'test rule' do
   it 'should not execute excluded tests with wildcards' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
     end
     task('test:something,-s*,-n*').invoke
     project('foo').test.tests.should_not include('something')
@@ -942,7 +942,7 @@ describe 'test rule' do
   it 'should execute all tests except excluded tests' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'anything', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'anything', 'nothing']) }
     end
     task('test:-nothing').invoke
     project('foo').test.tests.should include('something', 'anything')
@@ -953,7 +953,7 @@ describe 'test rule' do
     define 'foo' do
       test.using(:junit)
       test.exclude 'something'
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'anything', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'anything', 'nothing']) }
     end
     task('test:-nothing').invoke
     project('foo').test.tests.should include('something', 'anything')
@@ -964,7 +964,7 @@ describe 'test rule' do
     define 'foo' do
       test.using(:junit)
       test.include 'something'
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
     end
     task('test:nothing').invoke
     project('foo').test.tests.should include('nothing')
@@ -974,7 +974,7 @@ describe 'test rule' do
   it 'should not execute a test if it''s both included and excluded' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['nothing']) }
     end
     task('test:nothing,-nothing').invoke
     project('foo').test.tests.should_not include('nothing')
@@ -983,7 +983,7 @@ describe 'test rule' do
   it 'should not update the last successful test run timestamp' do
     define 'foo' do
       test.using(:junit)
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
     end
     a_second_ago = Time.now - 1
     touch_last_successful_test_run project('foo').test, a_second_ago
@@ -1000,8 +1000,8 @@ describe 'test failed' do
       define 'foo' do
         test.using(:junit)
         test.instance_eval do
-          @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest'])
-          @framework.stub!(:run).and_return(['PassingTest'])
+          @framework.stub(:tests).and_return(['FailingTest', 'PassingTest'])
+          @framework.stub(:run).and_return(['PassingTest'])
         end
       end
       project('foo').test
@@ -1012,8 +1012,8 @@ describe 'test failed' do
     define 'foo' do
       test.using(:junit)
       test.instance_eval do
-        @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest'])
-        @framework.stub!(:run).and_return(['PassingTest'])
+        @framework.stub(:tests).and_return(['FailingTest', 'PassingTest'])
+        @framework.stub(:run).and_return(['PassingTest'])
       end
     end
     write project('foo').path_to(:target, "junit-failed"), "FailingTest"
@@ -1026,8 +1026,8 @@ describe 'test failed' do
     define 'foo' do
       test.using(:junit).exclude('ExcludedTest')
       test.instance_eval do
-        @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest', 'ExcludedTest'])
-        @framework.stub!(:run).and_return(['PassingTest'])
+        @framework.stub(:tests).and_return(['FailingTest', 'PassingTest', 'ExcludedTest'])
+        @framework.stub(:run).and_return(['PassingTest'])
       end
     end
     write project('foo').path_to(:target, "junit-failed"), "FailingTest\nExcludedTest"
@@ -1041,16 +1041,16 @@ describe 'test failed' do
       define 'foo' do
         test.using(:junit)
         test.instance_eval do
-          @framework.stub!(:tests).and_return(['PassingTest'])
-          @framework.stub!(:run).and_return(['PassingTest'])
+          @framework.stub(:tests).and_return(['PassingTest'])
+          @framework.stub(:run).and_return(['PassingTest'])
         end
       end
       define 'bar' do
         test.using(:junit)
         test.enhance ["parent:foo:test"]
         test.instance_eval do
-          @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest'])
-          @framework.stub!(:run).and_return(['PassingTest'])
+          @framework.stub(:tests).and_return(['FailingTest', 'PassingTest'])
+          @framework.stub(:run).and_return(['PassingTest'])
         end
       end
     end
@@ -1268,10 +1268,10 @@ describe 'integration rule' do
   it 'should reset tasks to specific pattern' do
     define 'foo' do
       test.using :junit, :integration
-      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
       define 'bar' do
         test.using :junit, :integration
-        test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+        test.instance_eval { @framework.stub(:tests).and_return(['something', 'nothing']) }
       end
     end
     task('integration:something').invoke
@@ -1284,7 +1284,7 @@ describe 'integration rule' do
   it 'should apply *name* pattern' do
     define 'foo' do
       test.using :junit, :integration
-      test.instance_eval { @framework.stub!(:tests).and_return(['prefix-something-suffix']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['prefix-something-suffix']) }
     end
     task('integration:something').invoke
     project('foo').test.tests.should include('prefix-something-suffix')
@@ -1293,7 +1293,7 @@ describe 'integration rule' do
   it 'should not apply *name* pattern if asterisks used' do
     define 'foo' do
       test.using :junit, :integration
-      test.instance_eval { @framework.stub!(:tests).and_return(['prefix-something', 'prefix-something-suffix']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['prefix-something', 'prefix-something-suffix']) }
     end
     task('integration:*something').invoke
     project('foo').test.tests.should include('prefix-something')
@@ -1303,7 +1303,7 @@ describe 'integration rule' do
   it 'should accept multiple tasks separated by commas' do
     define 'foo' do
       test.using :junit, :integration
-      test.instance_eval { @framework.stub!(:tests).and_return(['foo', 'bar', 'baz']) }
+      test.instance_eval { @framework.stub(:tests).and_return(['foo', 'bar', 'baz']) }
     end
     task('integration:foo,bar').invoke
     project('foo').test.tests.should include('foo')

data/spec/core/transport_spec.rb

@@ -223,6 +223,10 @@ describe URI::FILE, '#write' do
 end
 
 
+def default_http_headers
+  {"Cache-Control" => "no-cache", "User-Agent" => "Buildr-#{Buildr::VERSION}"}
+end
+
 describe URI::HTTP, '#read' do
   before do
     @proxy = 'http://john:smith@myproxy:8080'
@@ -234,7 +238,7 @@ describe URI::HTTP, '#read' do
     @no_proxy_args = [@host_domain, 80]
     @proxy_args = @no_proxy_args + ['myproxy', 8080, 'john', 'smith']
     @http = mock('http')
-    @http.stub!(:request).and_yield(Net::HTTPNotModified.new(nil, nil, nil))
+    @http.stub(:request).and_yield(Net::HTTPNotModified.new(nil, nil, nil))
   end
 
   it 'should not use proxy unless proxy is set' do
@@ -305,8 +309,8 @@ describe URI::HTTP, '#read' do
 
   it 'should not die if content size is zero' do
     ok = Net::HTTPOK.new(nil, nil, nil)
-    ok.stub!(:read_body)
-    @http.stub!(:request).and_yield(ok)
+    ok.stub(:read_body)
+    @http.stub(:request).and_yield(ok)
     Net::HTTP.should_receive(:new).and_return(@http)
     $stdout.should_receive(:isatty).and_return(false)
     @uri.read :progress=>true
@@ -328,16 +332,16 @@ describe URI::HTTP, '#read' do
     redirect['Location'] = "http://#{@host_domain}/asdf"
 
     request1 = mock('request1')
-    Net::HTTP::Get.should_receive(:new).once.with('/', nil).and_return(request1)
+    Net::HTTP::Get.should_receive(:new).once.with('/', default_http_headers).and_return(request1)
     request1.should_receive(:basic_auth).with('john', 'secret')
     @http.should_receive(:request).with(request1).and_yield(redirect)
 
     # The second request will be ok
     ok = Net::HTTPOK.new(nil, nil, nil)
-    ok.stub!(:read_body)
+    ok.stub(:read_body)
 
     request2 = mock('request2')
-    Net::HTTP::Get.should_receive(:new).once.with("/asdf", nil).and_return(request2)
+    Net::HTTP::Get.should_receive(:new).once.with("/asdf", default_http_headers).and_return(request2)
     request2.should_receive(:basic_auth).with('john', 'secret')
     @http.should_receive(:request).with(request2).and_yield(ok)
 
@@ -346,8 +350,8 @@ describe URI::HTTP, '#read' do
 
   it 'should include the query part when performing HTTP GET' do
     # should this test be generalized or shared with any other URI subtypes?
-    Net::HTTP.stub!(:new).and_return(@http)
-    Net::HTTP::Get.should_receive(:new).with(/#{Regexp.escape(@query)}$/, nil)
+    Net::HTTP.stub(:new).and_return(@http)
+    Net::HTTP::Get.should_receive(:new).with(/#{Regexp.escape(@query)}$/, default_http_headers)
     @uri.read
   end
 
@@ -359,8 +363,8 @@ describe URI::HTTP, '#write' do
     @content = 'Readme. Please!'
     @uri = URI('http://john:secret@host.domain/foo/bar/baz.jar')
     @http = mock('Net::HTTP')
-    @http.stub!(:request).and_return(Net::HTTPOK.new(nil, nil, nil))
-    Net::HTTP.stub!(:new).and_return(@http)
+    @http.stub(:request).and_return(Net::HTTPOK.new(nil, nil, nil))
+    Net::HTTP.stub(:new).and_return(@http)
   end
 
   it 'should open connection to HTTP server' do
@@ -437,12 +441,12 @@ describe URI::SFTP, '#read' do
     @ssh_session = mock('Net::SSH::Session')
     @sftp_session = mock('Net::SFTP::Session')
     @file_factory = mock('Net::SFTP::Operations::FileFactory')
-    Net::SSH.stub!(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
+    Net::SSH.stub(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
       Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
       @sftp_session.should_receive(:connect!).and_return(@sftp_session)
       @sftp_session.should_receive(:loop)
       @sftp_session.should_receive(:file).with.and_return(@file_factory)
-      @file_factory.stub!(:open)
+      @file_factory.stub(:open)
       @ssh_session.should_receive(:close)
       @ssh_session
     end
@@ -485,15 +489,15 @@ describe URI::SFTP, '#write' do
     @ssh_session = mock('Net::SSH::Session')
     @sftp_session = mock('Net::SFTP::Session')
     @file_factory = mock('Net::SFTP::Operations::FileFactory')
-    Net::SSH.stub!(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
+    Net::SSH.stub(:start).with('localhost', 'john', :password=>'secret', :port=>22).and_return(@ssh_session) do
       Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
       @sftp_session.should_receive(:connect!).and_return(@sftp_session)
       @sftp_session.should_receive(:loop)
-      @sftp_session.stub!(:opendir!).and_return { fail }
-      @sftp_session.stub!(:close)
-      @sftp_session.stub!(:mkdir!)
+      @sftp_session.stub(:opendir!).and_return { fail }
+      @sftp_session.stub(:close)
+      @sftp_session.stub(:mkdir!)
       @sftp_session.should_receive(:file).with.and_return(@file_factory)
-      @file_factory.stub!(:open)
+      @file_factory.stub(:open)
       @ssh_session.should_receive(:close)
       @ssh_session
     end

data/spec/ide/idea_spec.rb

@@ -17,6 +17,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers'))
 
+def ensure_facet_xpath(doc, type, name)
+  facet_xpath = "/module/component[@name='FacetManager']/facet"
+  doc.should have_xpath(facet_xpath)
+  web_facet_xpath = "#{facet_xpath}[@type='#{type}', @name='#{name}']"
+  doc.should have_xpath(web_facet_xpath)
+  web_facet_xpath
+end
+
 describe Buildr::IntellijIdea do
 
   def invoke_generate_task
@@ -289,10 +297,517 @@ describe Buildr::IntellijIdea do
 
       it "generates an IML for root project with a web and webservice facet" do
         doc = xml_document(@foo._("foo.iml"))
-        facet_xpath = "/module/component[@name='FacetManager']/facet"
-        doc.should have_nodes(facet_xpath, 2)
-        doc.should have_xpath("#{facet_xpath}[@type='web', @name='Web']")
-        doc.should have_xpath("#{facet_xpath}[@type='WebServicesClient', @name='WebServices Client']")
+        ensure_facet_xpath(doc, 'web', 'Web')
+        ensure_facet_xpath(doc, 'WebServicesClient', 'WebServices Client')
+      end
+    end
+
+    describe "using add_gwt_facet" do
+      before do
+        @foo = define "foo" do
+          iml.add_gwt_facet("com.biz.MyModule" => true, "com.biz.MyOtherModule" => false)
+        end
+        invoke_generate_task
+      end
+
+      it "generates a gwt facet with default settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'gwt', 'GWT')
+        setting_xpath = "#{facet_xpath}/configuration/setting"
+        doc.should have_xpath("#{setting_xpath}[@name='gwtSdkUrl', value='file://$GWT_TOOLS$']")
+        doc.should have_xpath("#{setting_xpath}[@name='gwtScriptOutputStyle', value='PRETTY']")
+        doc.should have_xpath("#{setting_xpath}[@name='compilerParameters', value='-draftCompile -localWorkers 2 -strict']")
+        doc.should have_xpath("#{setting_xpath}[@name='compilerParameters', value='-draftCompile -localWorkers 2 -strict']")
+        doc.should have_xpath("#{setting_xpath}[@name='compilerMaxHeapSize', value='512']")
+        doc.should have_xpath("#{setting_xpath}[@name='webFacet', value='Web']")
+      end
+
+      it "generates a gwt facet with specified modules" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'gwt', 'GWT')
+        prefix = "#{facet_xpath}/configuration/packaging/module"
+        doc.should have_xpath("#{prefix}[@name='com.biz.MyModule', @enabled='true']")
+        doc.should have_xpath("#{prefix}[@name='com.biz.MyOtherModule', @enabled='false']")
+      end
+    end
+
+    describe "using add_gwt_facet that detects gwt sdk" do
+      before do
+        artifact('com.google.gwt:gwt-dev:jar:2.5.1-not-a-release') { |task| write task.name }
+        @foo = define "foo" do
+          compile.with 'com.google.gwt:gwt-dev:jar:2.5.1-not-a-release'
+          iml.add_gwt_facet("com.biz.MyModule" => true)
+        end
+        invoke_generate_task
+      end
+
+      it "generates a gwt facet with detected gwt sdk settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'gwt', 'GWT')
+        setting_xpath = "#{facet_xpath}/configuration/setting"
+        doc.should have_xpath("#{setting_xpath}[@name='gwtSdkType', value='maven']")
+        doc.should have_xpath("#{setting_xpath}[@name='gwtSdkUrl', value='$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.5.1-not-a-release']")
+      end
+    end
+
+    describe "using add_gwt_facet that specifies gwt sdk" do
+      before do
+        artifact('com.example:library:jar:2.0') { |task| write task.name }
+        @foo = define "foo" do
+          iml.add_gwt_facet({"com.biz.MyModule" => true},:gwt_dev_artifact => 'com.example:library:jar:2.0')
+        end
+        invoke_generate_task
+      end
+
+      it "generates a gwt facet with detected gwt sdk settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'gwt', 'GWT')
+        setting_xpath = "#{facet_xpath}/configuration/setting"
+        doc.should have_xpath("#{setting_xpath}[@name='gwtSdkType', value='maven']")
+        doc.should have_xpath("#{setting_xpath}[@name='gwtSdkUrl', value='$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.5.1']")
+      end
+    end
+
+    describe "using add_gwt_facet that specifies settings" do
+      before do
+        @foo = define "foo" do
+          iml.add_gwt_facet({"com.biz.MyModule" => true, "com.biz.MyOtherModule" => false},
+                            :settings => {:gwtScriptOutputStyle => 'OTHER', :compilerMaxHeapSize => 1024, :zang => 'zang'})
+        end
+        invoke_generate_task
+      end
+
+      it "generates a gwt facet with specified settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'gwt', 'GWT')
+        setting_xpath = "#{facet_xpath}/configuration/setting"
+        doc.should have_xpath("#{setting_xpath}[@name='zang', value='zang']")
+        doc.should have_xpath("#{setting_xpath}[@name='gwtScriptOutputStyle', value='OTHER']")
+        doc.should have_xpath("#{setting_xpath}[@name='compilerMaxHeapSize', value='1024']")
+      end
+    end
+
+    describe "using add_web_facet with jsf and idea version 12" do
+      before do
+        write "src/main/webapp/WEB-INF/web.xml"
+        write "src/main/webapp/WEB-INF/faces-config.xml"
+
+        @foo = define "foo" do
+          ipr.version = "12"
+          iml.add_web_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a web facet with jsf facet auto-detected" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        doc.should have_xpath("#{web_facet_xpath}/facet[@type='jsf', @name='JSF']")
+      end
+    end
+
+    describe "using add_web_facet with jsf and idea version 13" do
+      before do
+        write "src/main/webapp/WEB-INF/web.xml"
+        write "src/main/webapp/WEB-INF/faces-config.xml"
+
+        @foo = define "foo" do
+          ipr.version = "13"
+          iml.add_web_facet
+        end
+        invoke_generate_task
+      end
+
+      it "does not generate a web facet with jsf facet" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        doc.should_not have_xpath("#{web_facet_xpath}/facet[@type='jsf', @name='JSF']")
+      end
+    end
+
+    describe "using add_web_facet with jsf and idea version 13 and jsf 'enabled'" do
+      before do
+        write "src/main/webapp/WEB-INF/web.xml"
+        write "src/main/webapp/WEB-INF/faces-config.xml"
+
+        @foo = define "foo" do
+          ipr.version = "13"
+          iml.add_web_facet(:enable_jsf => true)
+        end
+        invoke_generate_task
+      end
+
+      it "does not generate a web facet with jsf facet" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        doc.should_not have_xpath("#{web_facet_xpath}/facet[@type='jsf', @name='JSF']")
+      end
+    end
+
+    describe "using add_web_facet" do
+      before do
+        write "src/main/webapp/WEB-INF/web.xml"
+        write "src/main/webapp/WEB-INF/glassfish-web.xml"
+        write "src/main/webapp/WEB-INF/context.xml"
+
+        @foo = define "foo" do
+          iml.add_web_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a web facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        deployment_descriptor_xpath = "#{web_facet_xpath}/configuration/descriptors/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='web.xml',  url='file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml']")
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='glassfish-web.xml',  url='file://$MODULE_DIR$/src/main/webapp/WEB-INF/glassfish-web.xml']")
+      end
+
+      it "generates a web facet with derived webroots" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        doc.should have_xpath("#{web_facet_xpath}/configuration/webroots/root[@url='file://$MODULE_DIR$/src/main/webapp', @realtive='/']")
+      end
+    end
+
+    describe "using add_web_facet with specified parameters" do
+      before do
+        @foo = define "foo" do
+          iml.add_web_facet(:deployment_descriptors => ["src/main/webapp2/WEB-INF/web.xml"],
+                            :webroots => {"src/main/webapp2" => "/", "src/main/css" => "/css"})
+        end
+        invoke_generate_task
+      end
+
+      it "generates a web facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        deployment_descriptor_xpath = "#{web_facet_xpath}/configuration/descriptors/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='web.xml',  url='file://$MODULE_DIR$/src/main/webapp2/WEB-INF/web.xml']")
+      end
+
+      it "generates a web facet with specified webroots" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        doc.should have_xpath("#{web_facet_xpath}/configuration/webroots/root[@url='file://$MODULE_DIR$/src/main/webapp2', @realtive='/']")
+        doc.should have_xpath("#{web_facet_xpath}/configuration/webroots/root[@url='file://$MODULE_DIR$/src/main/css', @realtive='/css']")
+      end
+    end
+
+    describe "using add_jpa_facet" do
+      before do
+        write "src/main/resources/META-INF/persistence.xml", "org.hibernate.ejb.HibernatePersistence"
+        write "src/main/resources/META-INF/orm.xml"
+
+        @foo = define "foo" do
+          iml.add_jpa_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jpa facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        deployment_descriptor_xpath = "#{facet_xpath}/configuration/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='persistence.xml',  url='file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml']")
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='orm.xml',  url='file://$MODULE_DIR$/src/main/resources/META-INF/orm.xml']")
+      end
+
+      it "generates a jpa facet with default settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='validation-enabled', @value='true']")
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='provider-name', @value='Hibernate']")
+      end
+    end
+
+    describe "using add_jpa_facet specifying parameters" do
+      before do
+        write "src/main/resources2/META-INF/persistence.xml"
+        write "src/main/resources2/META-INF/orm.xml"
+
+        @foo = define "foo" do
+          iml.add_jpa_facet(:provider_enabled => 'Hibernate',
+                            :deployment_descriptors => ["src/main/resources2/META-INF/persistence.xml",
+                                                        "src/main/resources2/META-INF/orm.xml"])
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jpa facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        deployment_descriptor_xpath = "#{facet_xpath}/configuration/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='persistence.xml',  url='file://$MODULE_DIR$/src/main/resources2/META-INF/persistence.xml']")
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='orm.xml',  url='file://$MODULE_DIR$/src/main/resources2/META-INF/orm.xml']")
+      end
+
+      it "generates a jpa facet with default settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='validation-enabled', @value='true']")
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='provider-name', @value='Hibernate']")
+      end
+    end
+
+    describe "using add_jpa_facet derived from main_source_directories" do
+      before do
+        write "src/main/resources2/META-INF/persistence.xml"
+        write "src/main/resources2/META-INF/orm.xml"
+
+        @foo = define "foo" do
+          iml.main_source_directories << "src/main/resources2"
+          iml.add_jpa_facet
+
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jpa facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        deployment_descriptor_xpath = "#{facet_xpath}/configuration/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='persistence.xml',  url='file://$MODULE_DIR$/src/main/resources2/META-INF/persistence.xml']")
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='orm.xml',  url='file://$MODULE_DIR$/src/main/resources2/META-INF/orm.xml']")
+      end
+    end
+
+    describe "using add_jpa_facet with hibernate configured in persistence.xml" do
+      before do
+        write "src/main/resources/META-INF/persistence.xml", "org.hibernate.ejb.HibernatePersistence"
+        write "src/main/resources/META-INF/orm.xml"
+
+        @foo = define "foo" do
+          iml.add_jpa_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jpa facet with default settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='validation-enabled', @value='true']")
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='provider-name', @value='Hibernate']")
+      end
+    end
+
+    describe "using add_jpa_facet with eclipselink configured in persistence.xml" do
+      before do
+        write "src/main/resources/META-INF/persistence.xml", "org.eclipse.persistence.jpa.PersistenceProvider"
+        write "src/main/resources/META-INF/orm.xml"
+
+        @foo = define "foo" do
+          iml.add_jpa_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jpa facet with default settings" do
+        doc = xml_document(@foo._("foo.iml"))
+        facet_xpath = ensure_facet_xpath(doc, 'jpa', 'JPA')
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='validation-enabled', @value='true']")
+        doc.should have_xpath("#{facet_xpath}/configuration/setting[@name='provider-name', @value='EclipseLink']")
+      end
+    end
+
+    describe "using add_ejb_facet" do
+      before do
+        write "src/main/java/com/bin/foo.java"
+        write "src/main/resources/WEB-INF/ejb-jar.xml"
+
+        @foo = define "foo" do
+          iml.add_ejb_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates an ejb facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
+        deployment_descriptor_xpath = "#{ejb_facet_xpath}/configuration/descriptors/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='ejb-jar.xml',  url='file://$MODULE_DIR$/src/main/resources/WEB-INF/ejb-jar.xml']")
+      end
+
+      it "generates an ejb facet with derived ejbRoots" do
+        doc = xml_document(@foo._("foo.iml"))
+        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
+        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/src/main/java']")
+        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/src/main/resources']")
+      end
+    end
+
+    describe "using add_ejb_facet specifying parameters" do
+      before do
+        @foo = define "foo" do
+          iml.add_ejb_facet(:ejb_roots => ["generated/main/java","generated/main/resources"],
+          :deployment_descriptors => ["generated/main/resources/WEB-INF/ejb-jar.xml"])
+        end
+        invoke_generate_task
+      end
+
+      it "generates an ejb facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
+        deployment_descriptor_xpath = "#{ejb_facet_xpath}/configuration/descriptors/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='ejb-jar.xml',  url='file://$MODULE_DIR$/generated/main/resources/WEB-INF/ejb-jar.xml']")
+      end
+
+      it "generates an ejb facet with derived ejbRoots" do
+        doc = xml_document(@foo._("foo.iml"))
+        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
+        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/generated/main/java']")
+        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/generated/main/resources']")
+      end
+    end
+
+    describe "using add_ejb_facet derived from main_source_directories" do
+      before do
+        write "src/main/resources2/WEB-INF/ejb-jar.xml"
+        @foo = define "foo" do
+          iml.main_source_directories << "src/main/resources2"
+          iml.add_ejb_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates an ejb facet with appropriate deployment descriptors" do
+        doc = xml_document(@foo._("foo.iml"))
+        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
+        deployment_descriptor_xpath = "#{ejb_facet_xpath}/configuration/descriptors/deploymentDescriptor"
+        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='ejb-jar.xml',  url='file://$MODULE_DIR$/src/main/resources2/WEB-INF/ejb-jar.xml']")
+      end
+    end
+
+    describe "using add_jruby_facet" do
+      before do
+
+        @foo = define "foo" do
+          iml.add_jruby_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jruby facet with appropriate sdk" do
+        doc = xml_document(@foo._("foo.iml"))
+        jruby_facet_xpath = ensure_facet_xpath(doc, 'JRUBY', 'JRuby')
+        doc.should have_xpath("#{jruby_facet_xpath}/configuration/JRUBY_FACET_CONFIG_ID[@NAME='JRUBY_SDK_NAME', VALUE='jruby-1.6.7.2']")
+      end
+
+      it "generates a jruby facet with appropriate paths" do
+        doc = xml_document(@foo._("foo.iml"))
+        jruby_facet_xpath = ensure_facet_xpath(doc, 'JRUBY', 'JRuby')
+        prefix = "#{jruby_facet_xpath}/configuration"
+        doc.should have_xpath("#{prefix}/LOAD_PATH[@number='0']")
+        doc.should have_xpath("#{prefix}/I18N_FOLDERS[@number='0']")
+      end
+    end
+
+    describe "using add_jruby_facet with .ruby-version specified" do
+      before do
+
+        write ".ruby-version", "jruby-1.7.2"
+
+        @foo = define "foo" do
+          iml.add_jruby_facet
+        end
+        invoke_generate_task
+      end
+
+      it "generates a jruby facet with appropriate sdk" do
+        doc = xml_document(@foo._("foo.iml"))
+        jruby_facet_xpath = ensure_facet_xpath(doc, 'JRUBY', 'JRuby')
+        doc.should have_xpath("#{jruby_facet_xpath}/configuration/JRUBY_FACET_CONFIG_ID[@NAME='JRUBY_SDK_NAME', VALUE='rbenv: jruby-1.7.2']")
+      end
+
+      it "generates a jruby facet with appropriate paths" do
+        doc = xml_document(@foo._("foo.iml"))
+        jruby_facet_xpath = ensure_facet_xpath(doc, 'JRUBY', 'JRuby')
+        prefix = "#{jruby_facet_xpath}/configuration"
+        doc.should have_xpath("#{prefix}/LOAD_PATH[@number='0']")
+        doc.should have_xpath("#{prefix}/I18N_FOLDERS[@number='0']")
+      end
+    end
+
+    describe "with add_data_source" do
+      before do
+        artifact("org.postgresql:postgresql:jar:9.not-a-version") { |task| write task.name }
+        @foo = define "foo" do
+          ipr.add_data_source("Postgres",
+                              :driver => 'org.postgresql.Driver',
+                              :url => "jdbc:postgresql://127.0.0.1:5432/MyDb",
+                              :username => "MyDBUser",
+                              :password => "secreto",
+                              :dialect => "PostgreSQL",
+                              :classpath => ["org.postgresql:postgresql:jar:9.not-a-version"])
+        end
+        invoke_generate_task
+      end
+
+      it "generates a data source manager with specified data source" do
+        doc = xml_document(@foo._("foo.ipr"))
+        prefix_xpath = "/project/component[@name='DataSourceManagerImpl', @format='xml', @hash='3208837817']/data-source"
+        doc.should have_nodes(prefix_xpath, 1)
+        ds_path = "#{prefix_xpath}[@source='LOCAL', @name='Postgres']"
+        doc.should have_xpath(ds_path)
+        doc.should have_xpath("#{ds_path}/synchronize/text() = 'true'")
+        doc.should have_xpath("#{ds_path}/jdbc-driver/text() = 'org.postgresql.Driver'")
+        doc.should have_xpath("#{ds_path}/jdbc-url/text() = 'jdbc:postgresql://127.0.0.1:5432/MyDb'")
+        doc.should have_xpath("#{ds_path}/user-name/text() = 'MyDBUser'")
+        doc.should have_xpath("#{ds_path}/user-password/text() = 'dfd9dfcfdfc9dfd8dfcfdfdedfc5'")
+        doc.should have_xpath("#{ds_path}/default-dialect/text() = 'PostgreSQL'")
+        doc.should have_xpath("#{ds_path}/libraries/library/url/text() = '$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.not-a-version/postgresql-9.not-a-version.jar'")
+      end
+    end
+
+    describe "with add_postgres_data_source" do
+      before do
+        ENV["USER"] = "Bob"
+        artifact("org.postgresql:postgresql:jar:9.2-1003-jdbc4") { |task| write task.name }
+        @foo = define "foo" do
+          ipr.add_postgres_data_source("Postgres", :database => 'MyDb')
+        end
+        invoke_generate_task
+      end
+
+      it "generates a data source manager with specified data source" do
+        doc = xml_document(@foo._("foo.ipr"))
+        prefix_xpath = "/project/component[@name='DataSourceManagerImpl', @format='xml', @hash='3208837817']/data-source"
+        doc.should have_nodes(prefix_xpath, 1)
+        ds_path = "#{prefix_xpath}[@source='LOCAL', @name='Postgres']"
+        doc.should have_xpath(ds_path)
+        doc.should have_xpath("#{ds_path}/synchronize/text() = 'true'")
+        doc.should have_xpath("#{ds_path}/jdbc-driver/text() = 'org.postgresql.Driver'")
+        doc.should have_xpath("#{ds_path}/jdbc-url/text() = 'jdbc:postgresql://127.0.0.1:5432/MyDb'")
+        doc.should have_xpath("#{ds_path}/user-name/text() = 'Bob'")
+        doc.should have_xpath("#{ds_path}/default-dialect/text() = 'PostgreSQL'")
+        doc.should have_xpath("#{ds_path}/libraries/library/url/text() = '$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.2-1003-jdbc4/postgresql-9.2-1003-jdbc4.jar'")
+      end
+    end
+
+    describe "with add_sql_server_data_source" do
+      before do
+        ENV["USER"] = "Bob"
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7') { |task| write task.name }
+        @foo = define "foo" do
+          ipr.add_sql_server_data_source("SqlServer", :database => 'MyDb')
+        end
+        invoke_generate_task
+      end
+
+      it "generates a data source manager with specified data source" do
+        doc = xml_document(@foo._("foo.ipr"))
+        prefix_xpath = "/project/component[@name='DataSourceManagerImpl', @format='xml', @hash='3208837817']/data-source"
+        doc.should have_nodes(prefix_xpath, 1)
+        ds_path = "#{prefix_xpath}[@source='LOCAL', @name='SqlServer']"
+        doc.should have_xpath(ds_path)
+
+        doc.should have_xpath("#{ds_path}/synchronize/text() = 'true'")
+        doc.should have_xpath("#{ds_path}/jdbc-driver/text() = 'net.sourceforge.jtds.jdbc.Driver'")
+        doc.should have_xpath("#{ds_path}/jdbc-url/text() = 'jdbc:jtds:sqlserver://127.0.0.1:1433/MyDb'")
+        doc.should have_xpath("#{ds_path}/user-name/text() = 'Bob'")
+        doc.should have_xpath("#{ds_path}/default-dialect/text() = 'TSQL'")
+        doc.should have_xpath("#{ds_path}/libraries/library/url/text() = '$MAVEN_REPOSITORY$/net/sourceforge/jtds/1.2.7/jtds-1.2.7.jar'")
       end
     end
 
@@ -320,6 +835,194 @@ describe Buildr::IntellijIdea do
       end
     end
 
+    describe "that uses add_jar_artifact with no overrides" do
+      before do
+        write 'foo/bar/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7.XX') { |task| write task.name }
+
+        @foo = define "foo" do
+          project.version = '1.0'
+          define "bar" do
+            compile.with 'net.sourceforge.jtds:jtds:jar:1.2.7.XX'
+            package :war
+          end
+          ipr.add_jar_artifact(project("bar"))
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with a jar artifact" do
+        doc = xml_document(@foo._("foo.ipr"))
+        base_xpath = "/project/component[@name='ArtifactManager']/artifact"
+        facet_xpath = "#{base_xpath}[@type='jar' and @name='bar.jar' and @build-on-make='false']"
+        doc.should have_xpath(facet_xpath)
+
+        doc.should have_xpath("#{facet_xpath}/output-path/text() = $PROJECT_DIR$/artifacts/bar")
+        doc.should have_xpath("#{facet_xpath}/root[@id='archive' and @name='bar.jar']/element[@id='module-output' and @name='bar']")
+      end
+    end
+
+    describe "that uses add_jar_artifact with overrides" do
+      before do
+        write 'foo/bar/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7.XX') { |task| write task.name }
+
+        @foo = define "foo" do
+          project.version = '1.0'
+          define "bar" do
+            compile.with 'net.sourceforge.jtds:jtds:jar:1.2.7.XX'
+            package :war
+          end
+          ipr.add_jar_artifact(project,
+                               :name => 'bar',
+                               :output_dir => _('bink'),
+                               :build_on_make => true,
+                               :ejb_module_names => ['x'],
+                               :jpa_module_names => ['p'],
+                               :dependencies => [project('bar')])
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with a jar artifact" do
+        doc = xml_document(@foo._("foo.ipr"))
+        base_xpath = "/project/component[@name='ArtifactManager']/artifact"
+        facet_xpath = "#{base_xpath}[@type='jar' and @name='bar.jar' and @build-on-make='true']"
+        doc.should have_xpath(facet_xpath)
+
+        doc.should have_xpath("#{facet_xpath}/output-path/text() = $PROJECT_DIR$/bink")
+        doc.should have_xpath("#{facet_xpath}/root[@id='archive' and @name='bar.jar']/element[@id='module-output' and @name='bar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='archive' and @name='bar.jar']/element[@id='jpa-descriptors' and @facet='p/jpa/JPA']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='archive' and @name='bar.jar']/element[@id='javaee-facet-resources' and @facet='x/ejb/EJB']")
+      end
+    end
+
+    describe "that uses add_exploded_ejb_artifact with overrides" do
+      before do
+        write 'foo/bar/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7.XX') { |task| write task.name }
+
+        @foo = define "foo" do
+          project.version = '1.0'
+          define "bar" do
+            compile.with 'net.sourceforge.jtds:jtds:jar:1.2.7.XX'
+            package :jar
+          end
+          ipr.add_exploded_ejb_artifact(project("bar"),
+                                        :ejb_module_names => ['x'],
+                                        :jpa_module_names => ['p'])
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with an ejb artifact" do
+        doc = xml_document(@foo._("foo.ipr"))
+        base_xpath = "/project/component[@name='ArtifactManager']/artifact"
+        facet_xpath = "#{base_xpath}[@type='exploded-ejb' and @name='bar' and @build-on-make='false']"
+        doc.should have_xpath(facet_xpath)
+        doc.should have_xpath("#{facet_xpath}/output-path/text() = $PROJECT_DIR$/artifacts/bar")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='module-output' and @name='bar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='jpa-descriptors' and @facet='p/jpa/JPA']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='javaee-facet-resources' and @facet='x/ejb/EJB']")
+      end
+    end
+
+    describe "that uses add_exploded_ejb_artifact with no overrides" do
+      before do
+        write 'foo/bar/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7.XX') { |task| write task.name }
+
+        @foo = define "foo" do
+          project.version = '1.0'
+          define "bar" do
+            compile.with 'net.sourceforge.jtds:jtds:jar:1.2.7.XX'
+            package :war
+          end
+          ipr.add_exploded_ejb_artifact(project("bar"))
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with an ejb artifact" do
+        doc = xml_document(@foo._("foo.ipr"))
+        base_xpath = "/project/component[@name='ArtifactManager']/artifact"
+        facet_xpath = "#{base_xpath}[@type='exploded-ejb' and @name='bar' and @build-on-make='false']"
+        doc.should have_xpath(facet_xpath)
+
+        doc.should have_xpath("#{facet_xpath}/output-path/text() = $PROJECT_DIR$/artifacts/bar")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='module-output' and @name='bar']")
+      end
+    end
+
+
+    describe "that uses add_exploded_war_artifact with no overrides" do
+      before do
+        write 'foo/bar/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7.XX') { |task| write task.name }
+
+        @foo = define "foo" do
+          project.version = '1.0'
+          define "bar" do
+            compile.with 'net.sourceforge.jtds:jtds:jar:1.2.7.XX'
+            package :war
+          end
+          ipr.add_exploded_war_artifact(project("bar"))
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with a war artifact" do
+        doc = xml_document(@foo._("foo.ipr"))
+        base_xpath = "/project/component[@name='ArtifactManager']/artifact"
+        facet_xpath = "#{base_xpath}[@type='exploded-war' and @name='bar' and @build-on-make='false']"
+        doc.should have_xpath(facet_xpath)
+
+        doc.should have_xpath("#{facet_xpath}/output-path/text() = $PROJECT_DIR$/artifacts/bar")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='directory' and @name='WEB-INF']/element[@id='directory', @name='classes']/element[@id='module-output' and @name='bar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='directory' and @name='WEB-INF']/element[@id='directory', @name='lib']/element[@id='file-copy' and @path='$MAVEN_REPOSITORY$/net/sourceforge/jtds/jtds/1.2.7.XX/jtds-1.2.7.XX.jar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='javaee-facet-resources' and @facet='bar/web/Web']")
+      end
+    end
+
+    describe "that uses add_exploded_war_artifact with overrides" do
+      before do
+        write 'foo/bar/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+        artifact('net.sourceforge.jtds:jtds:jar:1.2.7.XX') { |task| write task.name }
+
+        @foo = define "foo" do
+          project.version = '1.0'
+          define "bar" do
+            compile.with 'net.sourceforge.jtds:jtds:jar:1.2.7.XX'
+            package :war
+          end
+          ipr.add_exploded_war_artifact(project,
+                                        :name => 'gar',
+                                        :war_module_names => ['x','y'],
+                                        :gwt_module_names => ['p','q'],
+                                        :artifacts => ['baz','biz'],
+                                        :dependencies => ['net.sourceforge.jtds:jtds:jar:1.2.7.XX', project('bar')])
+        end
+        invoke_generate_task
+      end
+
+      it "generates an IPR with a war artifact" do
+        doc = xml_document(@foo._("foo.ipr"))
+        base_xpath = "/project/component[@name='ArtifactManager']/artifact"
+        facet_xpath = "#{base_xpath}[@type='exploded-war' @name='MyFancy.jar', @build-on-make='false']"
+        doc.should have_xpath(facet_xpath)
+
+        doc.should have_xpath("#{facet_xpath}/output-path/text() = $PROJECT_DIR$/artifacts/gar")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='directory' and @name='WEB-INF']/element[@id='directory', @name='classes']/element[@id='module-output' and @name='bar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='directory' and @name='WEB-INF']/element[@id='directory', @name='lib']/element[@id='file-copy' and @path='$MAVEN_REPOSITORY$/net/sourceforge/jtds/jtds/1.2.7.XX/jtds-1.2.7.XX.jar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='javaee-facet-resources' and @facet='x/web/Web']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='javaee-facet-resources' and @facet='y/web/Web']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='gwt-compiler-output' and @facet='p/gwt/GWT']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='gwt-compiler-output' and @facet='q/gwt/GWT']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='directory' and @name='WEB-INF']/element[@id='directory', @name='lib']/element[@id='artifact' and @artifact-name='baz.jar']")
+        doc.should have_xpath("#{facet_xpath}/root[@id='root']/element[@id='directory' and @name='WEB-INF']/element[@id='directory', @name='lib']/element[@id='artifact' and @artifact-name='biz.jar']")
+      end
+    end
+
     describe "with configurations added to root project" do
       before do
         @foo = define "foo" do