diff --git a/cypress/e2e/add-forge-now-request-create.cy.js b/cypress/e2e/add-forge-now-request-create.cy.js --- a/cypress/e2e/add-forge-now-request-create.cy.js +++ b/cypress/e2e/add-forge-now-request-create.cy.js @@ -142,6 +142,8 @@ .should('not.have.class', 'active'); cy.url() .should('include', `${this.Urls.forge_add_list()}`); + cy.get('.swh-add-forge-now-item') + .should('have.class', 'active'); cy.get('#swh-add-forge-requests-help-tab').click(); cy.get('#swh-add-forge-tab') @@ -152,6 +154,8 @@ .should('have.class', 'active'); cy.url() .should('include', `${this.Urls.forge_add_help()}`); + cy.get('.swh-add-forge-now-item') + .should('have.class', 'active'); cy.get('#swh-add-forge-tab').click(); cy.get('#swh-add-forge-tab') @@ -162,6 +166,8 @@ .should('not.have.class', 'active'); cy.url() .should('include', `${this.Urls.forge_add_create()}`); + cy.get('.swh-add-forge-now-item') + .should('have.class', 'active'); }); it('should show create form elements to authenticated user', function() { diff --git a/cypress/e2e/add-forge-now-request-dashboard.cy.js b/cypress/e2e/add-forge-now-request-dashboard.cy.js --- a/cypress/e2e/add-forge-now-request-dashboard.cy.js +++ b/cypress/e2e/add-forge-now-request-dashboard.cy.js @@ -95,6 +95,8 @@ cy.adminLogin(); cy.intercept(`${this.Urls.api_1_add_forge_request_get(requestId)}**`).as('forgeRequestGet'); cy.visit(url); + cy.get('.swh-add-forge-now-moderation-item') + .should('have.class', 'active'); }); it('should load add forge request details', function() { diff --git a/cypress/e2e/add-forge-now-requests-moderation.cy.js b/cypress/e2e/add-forge-now-requests-moderation.cy.js --- a/cypress/e2e/add-forge-now-requests-moderation.cy.js +++ b/cypress/e2e/add-forge-now-requests-moderation.cy.js @@ -95,6 +95,9 @@ cy.addForgeModeratorLogin(); cy.visit(addForgeModerationUrl); + cy.get('.swh-add-forge-now-moderation-item') + .should('have.class', 'active'); + cy.wait('@listRequests').then((xhr) => { cy.log('response:', xhr.response); cy.log(xhr.response.body); diff --git a/cypress/e2e/mailmap.cy.js b/cypress/e2e/mailmap.cy.js --- a/cypress/e2e/mailmap.cy.js +++ b/cypress/e2e/mailmap.cy.js @@ -96,7 +96,9 @@ cy.visit(this.url); cy.get('.swh-mailmap-admin-item') - .should('exist'); + .should('exist') + .should('have.class', 'active'); + }); it('should not create a new mailmap when input data are empty', function() { diff --git a/swh/web/templates/add_forge_now/common.html b/swh/web/templates/add_forge_now/common.html --- a/swh/web/templates/add_forge_now/common.html +++ b/swh/web/templates/add_forge_now/common.html @@ -65,6 +65,7 @@ diff --git a/swh/web/templates/add_forge_now/request-dashboard.html b/swh/web/templates/add_forge_now/request-dashboard.html --- a/swh/web/templates/add_forge_now/request-dashboard.html +++ b/swh/web/templates/add_forge_now/request-dashboard.html @@ -115,6 +115,7 @@ {% endblock %} diff --git a/swh/web/templates/add_forge_now/requests-moderation.html b/swh/web/templates/add_forge_now/requests-moderation.html --- a/swh/web/templates/add_forge_now/requests-moderation.html +++ b/swh/web/templates/add_forge_now/requests-moderation.html @@ -41,6 +41,7 @@ diff --git a/swh/web/templates/admin/mailmap.html b/swh/web/templates/admin/mailmap.html --- a/swh/web/templates/admin/mailmap.html +++ b/swh/web/templates/admin/mailmap.html @@ -48,6 +48,7 @@
{% endblock content %} diff --git a/swh/web/templates/layout.html b/swh/web/templates/layout.html --- a/swh/web/templates/layout.html +++ b/swh/web/templates/layout.html @@ -208,8 +208,8 @@ {% if FEATURES.add_forge_now %} -Add forge now
@@ -233,8 +233,8 @@ {% endif %} {% if FEATURES.add_forge_now %} {% if user.is_staff or ADD_FORGE_MODERATOR_PERMISSION in user.get_all_permissions %} -Add forge now