Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Phillip Webb
2015-06-30 15:04:06 -07:00
parent 3d27a34397 8ec10c8425
commit df3ced1a45
5 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolverTests.java
View File

@@ -20,12 +20,14 @@ import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
import org.springframework.boot.autoconfigure.mustache.web.MustacheViewResolver;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.support.StaticWebApplicationContext;
import org.springframework.web.servlet.View;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
/**
* Tests for {@link MustacheViewResolver}.
@@ -74,4 +76,12 @@ public class MustacheViewResolverTests {
assertNotNull(this.resolver.resolveViewName("foo", new Locale("de")));
}
@Test
public void setsContentType() throws Exception {
this.resolver.setContentType("application/octet-stream");
View view = this.resolver.resolveViewName("foo", null);
assertThat(view.getContentType(), equalTo("application/octet-stream"));
}
}