SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix resource filtering so it works with boot 1.3.x

Browse Source 
get's eureka branding back.

fixes gh-627
This commit is contained in:
Spencer Gibb
2015-11-04 16:39:04 -07:00
parent d954a5c525
commit 7eb5855815
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-eureka-server/pom.xml
View File

@@ -14,7 +14,7 @@
<properties>
<main.basedir>${basedir}/..</main.basedir>
<spring-cloud.version>1.1.0.BUILD-SNAPSHOT</spring-cloud.version>
<wro4j.version>1.7.6</wro4j.version>
<wro4j.version>1.7.9</wro4j.version>
</properties>
<dependencies>
<dependency>

4
spring-cloud-netflix-eureka-server/src/main/wro/wro.xml
View File

@@ -1,7 +1,7 @@
<groups xmlns="http://www.isdc.ro/wro">
<group name="wro">
<css>webjar:bootstrap/3.2.0/less/bootstrap.less</css>
<css>file:${project.basedir}/src/main/wro/main.less</css>
<css>webjar:bootstrap/3.2.0/less/bootstrap.less</css>
<css>file:@.project.basedir.@/src/main/wro/main.less</css>
<js>webjar:jquery/2.1.1/jquery.min.js</js>
<js>webjar:bootstrap/3.2.0/js/bootstrap.min.js</js>
</group>

20
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
View File

@@ -16,10 +16,6 @@
package org.springframework.cloud.netflix.eureka.server;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.util.Collections;
import java.util.Map;
@@ -42,6 +38,11 @@ import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = Application.class)
@WebAppConfiguration
@@ -91,4 +92,15 @@ public class ApplicationTests {
assertNotNull(body);
assertFalse("basePath contains double slashes", body.contains(basePath + "/"));
}
@Test
public void cssParsedByLess() {
String basePath = "http://localhost:" + this.port + "/eureka/css/wro.css";
ResponseEntity<String> entity = new TestRestTemplate().getForEntity(basePath,
String.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
String body = entity.getBody();
assertNotNull(body);
assertTrue("css wasn't preprocessed", body.contains("spring-logo"));
}
}