diff --git a/.github/workflows/testdriver.yml b/.github/workflows/testdriver.yml index 9cb57c92..929b6bf3 100644 --- a/.github/workflows/testdriver.yml +++ b/.github/workflows/testdriver.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Debug - Print masked secret run: | - if [ -n "${{secrets.TESTDRIVER_API_KEY}}" ]; + if [ -n "${{secrets.TESTDRIVER_API_KEY}}" ]; then echo "yes the api is there" else @@ -21,7 +21,6 @@ jobs: fi - uses: testdriverai/action@main with: - version: v4.0.44 key: ${{secrets.TESTDRIVER_API_KEY}} prerun: | npm install diff --git a/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java b/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java index 5b1b4070..cf0bcbd4 100644 --- a/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java +++ b/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java @@ -7,20 +7,19 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; +import lombok.extern.slf4j.Slf4j; import stirling.software.SPDF.model.ApplicationProperties; @Configuration @Lazy +@Slf4j public class EEAppConfig { - private static final Logger logger = LoggerFactory.getLogger(EEAppConfig.class); - @Autowired ApplicationProperties applicationProperties; - @Autowired private LicenseKeyChecker licenseKeyChecker; @Bean(name = "runningEE") public boolean runningEnterpriseEdition() { - return licenseKeyChecker.getEnterpriseEnabledResult(); + return licenseKeyChecker.getEnterpriseEnabledResult(); } -} +} \ No newline at end of file diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 24a2ca57..d31749da 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -360,7 +360,7 @@ </div> </li> - <li class="nav-item"> + <li class="nav-item" th:if="${!@runningEE}"> <a href="https://stirlingpdf.com/pricing" class="nav-link go-pro-link" target="_blank" rel="noopener noreferrer"> <span class="go-pro-badge" th:text="#{enterpriseEdition.button}"></span> </a> diff --git a/testdriver/test.yml b/testdriver/test.yml index d906e110..fa486b87 100644 --- a/testdriver/test.yml +++ b/testdriver/test.yml @@ -14,6 +14,8 @@ steps: action: click - prompt: click on view PDF commands: + - command: wait + timeout: 5000 - command: assert expect: a pdf is open - prompt: go back to the previous page @@ -127,10 +129,10 @@ steps: - command: wait timeout: 2000 - prompt: >- - click on Tools button in the header section and hover over merge button - and check if the background for the button is changed, similarly hover - over all the rest of the buttons and check for the background of the - button to change + click on Tools button in the header section and Check if the background of + the merge button is highlighted when hovered over, similarly hover over a + few other buttons and check for the background of the button is highlighted + when hovered over commands: - command: focus-application name: Google Chrome @@ -138,28 +140,29 @@ steps: text: Tools description: Tools button in the header section action: click + - command: assert + expect: the Tools dropdown is open - command: hover-text text: Merge description: Merge button action: hover - command: assert - expect: the background of the Merge button is changed + expect: the background of the Merge button is highlighted - command: hover-text text: PDF to Image description: PDF to Image button action: hover - command: assert - expect: the background of the PDF to Image button is changed + expect: the background of the PDF to Image button is highlighted - command: hover-text text: PDF to CSV description: PDF to CSV button action: hover - command: assert - expect: the background of the PDF to CSV button is changed + expect: the background of the PDF to CSV button is highlighted - command: hover-text text: Sign description: Sign button action: hover - command: assert - expect: the background of the Sign button is changed - + expect: the background of the Sign button is highlighted