Merge pull request #1516 from netcare-io/bugfix/bootstrap-4-update

Bugfix/bootstrap 4 update
unclebob · Feb 23, 2025 · 8df1927 · 8df1927
2 parents 1bb9e78 + 077406b
commit 8df1927
Show file tree

Hide file tree

Showing 177 changed files with 8,320 additions and 8,472 deletions.
diff --git a/...stResponders/SuiteResponder/EmptySuiteSetUpAndTearDownShouldCountAsRightPages/content.txt b/...stResponders/SuiteResponder/EmptySuiteSetUpAndTearDownShouldCountAsRightPages/content.txt
@@ -32,7 +32,7 @@ For normal (HTML) responses:
 !|script |
 | check | request page | SuiteParent?suite | 200 |
 | show | content |
-| ensure | content contains | <strong>Test Pages:</strong> 4 right, 0 wrong, 0 ignored, 0 exceptions |
+| ensure | content contains | <strong>Test Pages:</strong>&nbsp;4 right, 0 wrong, 0 ignored, 0 exceptions |
 | ensure | content matches | 0 right, 0 wrong, 0 ignored, 0 exceptions.*>SuiteSetUp</a> |
 | ensure | content matches | 0 right, 0 wrong, 0 ignored, 0 exceptions.*>SuiteTearDown</a> |
 

diff --git a/...se/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestResponder/content.txt b/...se/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestResponder/content.txt
@@ -24,7 +24,7 @@ The bgcolor of the cell should turn green
 |Response Examiner.|
 |type  |pattern|matches?|
 |contents|class="pass"|true|
-|contents|Assertions:.*\s+.*?1 right, 0 wrong, 0 ignored, 0 exceptions|true|
+|contents|Assertions:.*1 right, 0 wrong, 0 ignored, 0 exceptions|true|
 
 The error log page should not have any errors
 

diff --git a/...tNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationDefault/content.txt b/...tNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationDefault/content.txt
@@ -13,13 +13,13 @@ Request the page
 
 Examine the requested page to ensure the correct links are displayed in the correct order.
 
-!| Response Examiner.                                                        |
-|line                                                               |inOrder?|
-|<li><a href="SomePage?edit" accesskey="e">Edit</a></li>            |true    |
-|<li><a href="SomePage?properties" accesskey="p">Properties</a></li>|true    |
-|<li><a href="SomePage?whereUsed" accesskey="w">Where Used</a></li> |true    |
-|<li><a href="SomePage?versions" accesskey="v">Versions</a></li>    |true    |
-|<a href="/files" accesskey="f">Files</a></li>                      |true    |
-|<li><a href="?search" accesskey="s">Search</a></li>                |true    |
-|<li><a href="/RecentChanges" accesskey="">Recent Changes</a></li>  |true    |
-|<a href="/FitNesse.UserGuide" accesskey="">User Guide</a></li>     |true    |
+!| Response Examiner.                                                                              |
+|line                                                                                     |inOrder?|
+|<li><a class="nav-link text-secondary" href="SomePage?edit" accesskey="e">Edit</a></li>  |true    |
+|<li><a class="dropdown-item" href="SomePage?properties" accesskey="p">Properties</a></li>|true    |
+|<li><a class="dropdown-item" href="SomePage?whereUsed" accesskey="w">Where Used</a></li> |true    |
+|<li><a class="dropdown-item" href="SomePage?versions" accesskey="v">Versions</a></li>    |true    |
+|<a class="dropdown-item" href="/files" accesskey="f">Files</a></li>                      |true    |
+|<li><a class="dropdown-item" href="?search" accesskey="s">Search</a></li>                |true    |
+|<li><a class="dropdown-item" href="/RecentChanges" accesskey="">Recent Changes</a></li>  |true    |
+|<a class="dropdown-item" href="/FitNesse.UserGuide" accesskey="">User Guide</a></li>     |true    |
diff --git a/...esse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithSuite/content.txt b/...esse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithSuite/content.txt
@@ -13,17 +13,17 @@ Request the page
 
 Examine the requested page to ensure the correct links are displayed in the correct order.
 
-!| Response Examiner.                                                  |
-|line                                                         |inOrder?|
-|<a href="SomePage?suite" accesskey="t">Suite</a>             |true    |
-|<a href="SomePage?edit" accesskey="e">Edit</a>               |true    |
-|<a href="SomePage?properties" accesskey="p">Properties</a>   |true    |
-|<a href="SomePage?whereUsed" accesskey="w">Where Used</a>    |true    |
-|<a href="SomePage?versions" accesskey="v">Versions</a>       |true    |
-|<a href="/files" accesskey="f">Files</a>                     |true    |
-|<a href="?search" accesskey="s">Search</a>                   |true    |
-|<a href="/RecentChanges" accesskey="">Recent Changes</a>     |true    |
-|<a href="?testHistory">Test History</a>                      |true    |
-|<a href="SomePage?pageHistory" accesskey="h">Page History</a>|true    |
-|<a href="?suite&amp;remote_debug">Remote Debug</a>           |true    |
-|<a href="/FitNesse.UserGuide" accesskey="">User Guide</a>    |true    |
+!| Response Examiner.                                                                        |
+|line                                                                               |inOrder?|
+|<a class="nav-link text-secondary" href="SomePage?suite" accesskey="t">Suite</a>   |true    |
+|<a class="nav-link text-secondary" href="SomePage?edit" accesskey="e">Edit</a>     |true    |
+|<a class="dropdown-item" href="SomePage?properties" accesskey="p">Properties</a>   |true    |
+|<a class="dropdown-item" href="SomePage?whereUsed" accesskey="w">Where Used</a>    |true    |
+|<a class="dropdown-item" href="SomePage?versions" accesskey="v">Versions</a>       |true    |
+|<a class="dropdown-item" href="/files" accesskey="f">Files</a>                     |true    |
+|<a class="dropdown-item" href="?search" accesskey="s">Search</a>                   |true    |
+|<a class="dropdown-item" href="/RecentChanges" accesskey="">Recent Changes</a>     |true    |
+|<a class="dropdown-item" href="?testHistory">Test History</a>                      |true    |
+|<a class="dropdown-item" href="SomePage?pageHistory" accesskey="h">Page History</a>|true    |
+|<a class="dropdown-item" href="?suite&amp;remote_debug">Remote Debug</a>           |true    |
+|<a class="dropdown-item" href="/FitNesse.UserGuide" accesskey="">User Guide</a>    |true    |
diff --git a/...Nesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithTest/content.txt b/...Nesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithTest/content.txt
@@ -13,17 +13,17 @@ Request the page
 
 Examine the requested page to ensure the correct links are displayed in the correct order.
 
-!| Response Examiner.                                                  |
-|line                                                         |inOrder?|
-|<a href="SomePage?test" accesskey="t">Test</a>               |true    |
-|<a href="SomePage?edit" accesskey="e">Edit</a>               |true    |
-|<a href="SomePage?properties" accesskey="p">Properties</a>   |true    |
-|<a href="SomePage?whereUsed" accesskey="w">Where Used</a>    |true    |
-|<a href="SomePage?versions" accesskey="v">Versions</a>       |true    |
-|<a href="/files" accesskey="f">Files</a>                     |true    |
-|<a href="?search" accesskey="s">Search</a>                   |true    |
-|<a href="/RecentChanges" accesskey="">Recent Changes</a>     |true    |
-|<a href="?testHistory">Test History</a>                      |true    |
-|<a href="SomePage?pageHistory" accesskey="h">Page History</a>|true    |
-|<a href="?test&amp;remote_debug">Remote Debug</a>            |true    |
-|<a href="/FitNesse.UserGuide" accesskey="">User Guide</a>    |true    |
+!| Response Examiner.                                                                        |
+|line                                                                               |inOrder?|
+|<a class="nav-link text-secondary" href="SomePage?test" accesskey="t">Test</a>     |true    |
+|<a class="nav-link text-secondary" href="SomePage?edit" accesskey="e">Edit</a>     |true    |
+|<a class="dropdown-item" href="SomePage?properties" accesskey="p">Properties</a>   |true    |
+|<a class="dropdown-item" href="SomePage?whereUsed" accesskey="w">Where Used</a>    |true    |
+|<a class="dropdown-item" href="SomePage?versions" accesskey="v">Versions</a>       |true    |
+|<a class="dropdown-item" href="/files" accesskey="f">Files</a>                     |true    |
+|<a class="dropdown-item" href="?search" accesskey="s">Search</a>                   |true    |
+|<a class="dropdown-item" href="/RecentChanges" accesskey="">Recent Changes</a>     |true    |
+|<a class="dropdown-item" href="?testHistory">Test History</a>                      |true    |
+|<a class="dropdown-item" href="SomePage?pageHistory" accesskey="h">Page History</a>|true    |
+|<a class="dropdown-item" href="?test&amp;remote_debug">Remote Debug</a>            |true    |
+|<a class="dropdown-item" href="/FitNesse.UserGuide" accesskey="">User Guide</a>    |true    |
diff --git a/build.gradle b/build.gradle
@@ -26,6 +26,7 @@ plugins {
   id 'signing'
   id "com.github.ben-manes.versions" version "0.51.0"
   id "groovy"
+  id "io.miret.etienne.sass" version "1.5.0"
 }
 
 apply plugin: "info.solidsoft.pitest"
@@ -101,12 +102,9 @@ task fitNesseVersion {
   }
 }
 
-task compileBootstrap(type: LessCompiler) {
-  mainClass.set('org.mozilla.javascript.tools.shell.Main')
-  inputDir file('src/fitnesse/resources/bootstrap/less')
-  mainLessFile = 'fitnesse-bootstrap.less'
-  cssFile file("${sourceSets.main.output.resourcesDir}/fitnesse/resources/bootstrap/css/fitnesse-bootstrap.css")
-  classpath configurations.lesscss
+compileSass {
+  sourceDir = project.file ("src/fitnesse/resources/scss/custom")
+  outputDir = project.file ("${sourceSets.main.output.resourcesDir}/fitnesse/resources/bootstrap/css")
 }
 
 task createUpdateLists(type: WikiFileListBuilderTask) {
@@ -138,7 +136,7 @@ task createUpdateLists(type: WikiFileListBuilderTask) {
     "FitNesseRoot/TemplateLibrary/TestPage/properties.xml" ]
 }
 
-processResources.dependsOn "fitNesseVersion", "compileBootstrap", "createUpdateLists"
+processResources.dependsOn "fitNesseVersion", "compileSass", "createUpdateLists"
 
 task copyRuntimeLibs(type: Copy) {
   into "lib"

diff --git a/src/fitnesse/reporting/SuiteHtmlFormatter.java b/src/fitnesse/reporting/SuiteHtmlFormatter.java
@@ -180,11 +180,11 @@ public void testSystemStarted(TestSystem testSystem) {
 
   @Override
   protected String makeSummaryContent() {
-    String summaryContent = "<strong>Test Pages:</strong> " + pageCounts.toString() + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+    String summaryContent = "<strong>Test Pages:</strong>&nbsp;" + pageCounts.toString() + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
     if (latestTestTime != null) {
-      summaryContent += String.format("<strong>Assertions:</strong> %s (%.03f seconds)", getAssertionCounts(), latestTestTime.elapsedSeconds());
+      summaryContent += String.format("<strong>Assertions:</strong>&nbsp;%s (%.03f seconds)", getAssertionCounts(), latestTestTime.elapsedSeconds());
     } else {
-      summaryContent += String.format("<strong>Assertions:</strong> %s ", getAssertionCounts());
+      summaryContent += String.format("<strong>Assertions:</strong>&nbsp;%s ", getAssertionCounts());
     }
     return summaryContent;
   }

diff --git a/src/fitnesse/resources/bootstrap/less/alerts.less b/src/fitnesse/resources/bootstrap/less/alerts.less
diff --git a/src/fitnesse/resources/bootstrap/less/badges.less b/src/fitnesse/resources/bootstrap/less/badges.less
diff --git a/src/fitnesse/resources/bootstrap/less/breadcrumbs.less b/src/fitnesse/resources/bootstrap/less/breadcrumbs.less