diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java index e3e6bb8..9c200f6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java @@ -79,7 +79,8 @@ protected HtmlPage(ViewContext ctx) { @Override public void render() { puts(DOCTYPE); - render(page().html().meta_http("Content-type", MimeType.HTML)); + render(page().html().meta_http("X-UA-Compatible", "IE=8") + .meta_http("Content-type", MimeType.HTML)); if (page().nestLevel() != 0) { throw new WebAppException("Error rendering page: nestLevel="+ page().nestLevel()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java index 29ac6b4..66d9ef2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java @@ -70,6 +70,6 @@ public void render(Block html) { out.flush(); verify(out).print("sub1 text"); verify(out).print("sub2 text"); - verify(out, times(15)).println(); // test inline transition across views + verify(out, times(16)).println(); // test inline transition across views } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java index d99384b..a5a8e1f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java @@ -22,11 +22,12 @@ import java.io.PrintWriter; +import org.apache.hadoop.yarn.webapp.MimeType; import org.apache.hadoop.yarn.webapp.WebAppException; import org.apache.hadoop.yarn.webapp.test.WebAppTests; import org.apache.hadoop.yarn.webapp.view.HtmlPage; - import org.junit.Test; + import static org.mockito.Mockito.*; public class TestHtmlPage { @@ -53,6 +54,12 @@ public void render(Page.HTML<_> html) { Injector injector = WebAppTests.testPage(TestView.class); PrintWriter out = injector.getInstance(PrintWriter.class); + // Verify the HTML page has correct meta tags in the header + verify(out).print(" http-equiv=\"X-UA-Compatible\""); + verify(out).print(" content=\"IE=8\""); + verify(out).print(" http-equiv=\"Content-type\""); + verify(out).print(String.format(" content=\"%s\"", MimeType.HTML)); + verify(out).print("test"); verify(out).print(" id=\"testid\""); verify(out).print("test note");