Merge 59398214-spring-framework-detection to master

Glyn Normington · Glyn Normington · commit 0b2613c515ef · 2013-10-23T15:01:14.000+01:00
[Completes #59398214]
diff --git a/lib/java_buildpack/framework/spring_auto_reconfiguration.rb b/lib/java_buildpack/framework/spring_auto_reconfiguration.rb
@@ -47,7 +47,7 @@ def supports?
 
     private
 
-    SPRING_JAR_PATTERN = 'spring-core*.jar'.freeze
+    SPRING_JAR_PATTERN = '*spring-core*.jar'.freeze
 
     WEB_XML = File.join 'WEB-INF', 'web.xml'.freeze
 
diff --git a/spec/fixtures/framework_auto_reconfiguration_long_spring_jar_name/WEB-INF/lib/org.springframework.spring-core-3.2.3.RELEASE.jar b/spec/fixtures/framework_auto_reconfiguration_long_spring_jar_name/WEB-INF/lib/org.springframework.spring-core-3.2.3.RELEASE.jar
diff --git a/spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb b/spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb
@@ -44,6 +44,17 @@ module JavaBuildpack::Framework
       expect(detected).to eq('spring-auto-reconfiguration=0.6.8')
     end
 
+    it 'should detect with Spring JAR which has a long name' do
+      JavaBuildpack::Repository::ConfiguredItem.stub(:find_item).and_return(SPRING_AUTO_RECONFIGURATION_DETAILS)
+
+      detected = SpringAutoReconfiguration.new(
+          app_dir: 'spec/fixtures/framework_auto_reconfiguration_long_spring_jar_name',
+          configuration: {}
+      ).detect
+
+      expect(detected).to eq('spring-auto-reconfiguration=0.6.8')
+    end
+
     it 'should not detect without Spring JAR' do
       detected = SpringAutoReconfiguration.new(
           app_dir: 'spec/fixtures/framework_none',
