Skip to content

Commit 97f2599

Browse files
committed
[JENKINS-76289] Add icon size control to new dashboard
1 parent 06e3753 commit 97f2599

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

core/src/main/resources/lib/hudson/projectView.jelly

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,11 @@ THE SOFTWARE.
8888
</div>
8989

9090
<l:userExperimentalFlag var="newDashboardPage" flagClassName="jenkins.model.experimentalflags.NewDashboardPageUserExperimentalFlag" />
91-
<j:if test="${!newDashboardPage}">
92-
<t:iconSize><t:rssBar/></t:iconSize>
93-
</j:if>
91+
<t:iconSize>
92+
<j:if test="${!newDashboardPage}">
93+
<t:rssBar/>
94+
</j:if>
95+
</t:iconSize>
9496
</div>
9597

9698
<div class="jenkins-jobs-list jenkins-mobile-show">

test/src/test/java/hudson/model/ViewTest.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import java.util.logging.LogRecord;
7272
import jenkins.model.Jenkins;
7373
import jenkins.model.ProjectNamingStrategy;
74+
import jenkins.model.experimentalflags.UserExperimentalFlagsProperty;
7475
import jenkins.security.NotReallyRoleSensitiveCallable;
7576
import org.htmlunit.FailingHttpStatusCodeException;
7677
import org.htmlunit.FormEncodingType;
@@ -137,6 +138,27 @@ void roundTrip() throws Exception {
137138
assertTrue(view.isFilterQueue());
138139
}
139140

141+
@Issue("JENKINS-76289")
142+
@Test
143+
void newDashboardShowsIconSizeControl() throws Exception {
144+
j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
145+
146+
User user = User.getOrCreateByIdOrFullName("new-dashboard-user");
147+
Map<String, String> flags = new HashMap<>();
148+
flags.put("new-dashboard-page.flag", "true");
149+
user.addProperty(new UserExperimentalFlagsProperty(flags));
150+
151+
j.createFreeStyleProject("p");
152+
153+
WebClient webClient = j.createWebClient().withBasicCredentials(user.getId());
154+
HtmlPage page = webClient.goTo("view/all/");
155+
156+
assertNotNull(page.getFirstByXPath("//div[contains(@class,'app-build-bar')]"));
157+
assertNotNull(page.getFirstByXPath("//div[contains(@class,'jenkins-icon-size')]"));
158+
assertNotNull(page.getFirstByXPath("//a[contains(@href,'iconSize?16x16')]"));
159+
assertNotNull(page.getFirstByXPath("//a[contains(@href,'iconSize?24x24')]"));
160+
}
161+
140162
@Issue("JENKINS-7100")
141163
@Test
142164
void xHudsonHeader() throws Exception {

0 commit comments

Comments
 (0)