You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
IndexHtmlServletTest included a disabled Angular HTML addon test because it depended on the generated file at zeppelin-web-angular/dist/zeppelin/index.html. That artifact is not built during normal zeppelin-server tests, so the test could not run independently.
This PR replaces the frontend build dependency with a temporary, test-owned index.html file and re-enables testZeppelinWebAngularHtmlAddon.
The zeppelin-web index and the Angular-style index exercise different branches in IndexHtmlServlet. The zeppelin-web index does not contain explicit </head> and </body> closing tags, so the servlet falls back to inserting the head addon before <body> and the body addon before </html>. The Angular-style index contains both closing tags, so the re-enabled test verifies that the configured head and body addons are inserted immediately before </head> and </body>.
What type of PR is it?
Improvement
Todos
Remove the dependency on zeppelin-web-angular/dist/zeppelin/index.html
Create a temporary, test-owned Angular-style index.html
Since the PR's goal is to make IndexHtmlServletTest independent of the frontend build, could we apply the same treatment to testZeppelinWebHtmlAddon in this PR? It still hardcodes ../zeppelin-web/dist/index.html, another git-ignored build artifact. It only passes in CI because the core job builds zeppelin-web via -Pweb-classic; a clean local ./mvnw test -pl zeppelin-server would fail it for the exact reason you're fixing on the Angular side. Reusing the @TempDir pattern here (with a document that omits the closing tags, so it exercises the fallback branch in IndexHtmlServlet) would make both tests fully self-contained and complete the stated goal.
Thanks for catching this. I updated testZeppelinWebHtmlAddon to use @TempDir as well and to verify the fallback behavior using an HTML document without closing tags.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is this PR for?
IndexHtmlServletTestincluded a disabled Angular HTML addon test because it depended on the generated file atzeppelin-web-angular/dist/zeppelin/index.html. That artifact is not built during normalzeppelin-servertests, so the test could not run independently.This PR replaces the frontend build dependency with a temporary, test-owned
index.htmlfile and re-enablestestZeppelinWebAngularHtmlAddon.The
zeppelin-webindex and the Angular-style index exercise different branches inIndexHtmlServlet. Thezeppelin-webindex does not contain explicit</head>and</body>closing tags, so the servlet falls back to inserting the head addon before<body>and the body addon before</html>. The Angular-style index contains both closing tags, so the re-enabled test verifies that the configured head and body addons are inserted immediately before</head>and</body>.What type of PR is it?
Improvement
Todos
zeppelin-web-angular/dist/zeppelin/index.htmlindex.htmltestZeppelinWebAngularHtmlAddon</head>and</body>What is the Jira issue?
[ZEPPELIN-6435]
How should this be tested?
./mvnw test -pl zeppelin-server -Dtest=IndexHtmlServletTestpasses successfully.Screenshots (if appropriate)
N/A
Questions: