#2490: fixing tests

dashboard-prime/src/components/users/UsersTable.vue

@@ -129,15 +129,11 @@ const pageChanged = (pagingInfo) => {
   loadData()
 }
 
-
-// const sortField = (column) => {
-//   sortBy.value = column.sortField
-//   ascending.value = column.sortOrder === 1
-//
-//   // set to the first page
-//   currentPage.value = 1
-//   loadData()
-// }
+const sortField = () => {
+  // set to the first page
+  currentPage.value = 1
+  loadData()
+}
 </script>
 
 <template>
@@ -187,7 +183,7 @@ const pageChanged = (pagingInfo) => {
         :rowsPerPageOptions="possiblePageSizes"
         v-model:sort-field="sortInfo.sortBy"
         v-model:sort-order="sortInfo.sortOrder"
-        @sort="loadData"
+        @sort="sortField"
       >
         <Column field="userId" header="User" :sortable="true" :class="{'flex': responsive.md.value }">
           <template #header>

dashboard-prime/src/skills-display/components/skill/SkillPage.vue

@@ -52,7 +52,7 @@ const nextButtonClicked = () => {
   )
 }
 
-const isLoading = computed(() => loadingSkill.value)
+const isLoading = computed(() => loadingSkill.value || skillState.loadingSkillSummary)
 
 </script>
 

dashboard-prime/src/skills-display/components/skill/prerequisites/Prerequisites.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { Network } from 'vis-network'
 import { useSkillsDisplayAttributesState } from '@/skills-display/stores/UseSkillsDisplayAttributesState.js'
@@ -54,13 +54,21 @@ const displayOptions = {
 }
 
 onMounted(() => {
+  loadAllDataForPrereq()
+})
+
+watch( () => route.params.skillId, () => {
+  loadAllDataForPrereq()
+});
+
+const loadAllDataForPrereq  = () => {
   loadData().then(() => {
     if (dependenciesInternal.value?.length > 0) {
       initInternalDeps()
       createGraph()
     }
   })
-})
+}
 
 
 const isDependency = () => {

dashboard-prime/src/skills-display/stores/UseSkillsDisplaySubjectState.js

@@ -135,6 +135,7 @@ export const useSkillsDisplaySubjectState = defineStore('skillDisplaySubjectStat
       subjectSummary,
       loadSkillSummary,
       skillSummary,
+      loadingSkillSummary,
       addPoints,
       nullifyExpirationDate,
       updateDescription,

e2e-tests/cypress/e2e/inception/inception_breadcrumb_spec.js

@@ -107,15 +107,15 @@ describe('My Progress Breadcrumb Tests', () => {
     });
 
     it('test breadcrumbs starting on Rank page', function () {
-        cy.visit('/administrator/skills/inception/rank');
+        cy.visit('/administrator/skills/Inception/rank');
 
+        cy.get('[data-cy="levelBreakdownChart-animationEnded"]')
         cy.get('[data-cy="title"]').contains('My Rank');
         cy.get('[data-pc-name="breadcrumb"] [data-pc-section="action"] [data-cy="breadcrumb-Projects"]')
         cy.get('[data-pc-name="breadcrumb"] [data-pc-section="action"] [data-cy="breadcrumb-Dashboard Skills"]')
         cy.get('[data-pc-name="breadcrumb"] [data-pc-section="action"]').should('have.length', 2)
         cy.get('[data-pc-name="breadcrumb"] [data-cy="breadcrumb-Rank"]')
 
-
         cy.get('[data-pc-name="breadcrumb"] [data-pc-section="action"] [data-cy="breadcrumb-Dashboard Skills"]').click()
         cy.get('[data-cy="title"]').contains('Dashboard Skills');
 

e2e-tests/cypress/e2e/learning-path/client-display-learning-path-graph-snapshots_spec.js

@@ -269,7 +269,7 @@ describe('Client Display Prerequisites Snapshot Tests', () => {
             .contains('Very Great Skill 3');
         cy.get('[data-cy="depsProgress"] [data-cy="numDeps"]').should('have.text', '2')
         cy.wait(4000);
-        cy.matchSnapshotImageForElement('[data-cy="skillsDisplayHome"]', `InProjectDependency-parent`);
+        cy.matchSnapshotImageForElement('[data-cy="skillsDisplayHome"] [data-cy="prerequisitesCard"]', `InProjectDependency-parent`);
 
         // Go to child dependency page
         cy.clickOnNode(600, 262);
@@ -278,7 +278,7 @@ describe('Client Display Prerequisites Snapshot Tests', () => {
         // should render Prerequisites section
         cy.get('[data-cy="depsProgress"] [data-cy="numDeps"]').should('have.text', '1')
         cy.wait(4000);
-        cy.matchSnapshotImageForElement('[data-cy="skillsDisplayHome"]', `InProjectDependency-child`);
+        cy.matchSnapshotImageForElement('[data-cy="skillsDisplayHome"] [data-cy="prerequisitesCard"]', `InProjectDependency-child`);
     });
 
     it('cross-project skill dep is shown when skill ids match', function () {

e2e-tests/cypress/e2e/users_spec.js

@@ -48,8 +48,7 @@ describe('Users Tests', () => {
             }
         }
 
-        cy.visit('/administrator/projects/proj1/');
-        cy.clickNav('Users');
+        cy.visit('/administrator/projects/proj1/users');
 
         // default sort order is 'Points Last Earned' desc
         cy.validateTable(tableSelector, [