+.theme--light {
+ .section-header {
+ color: white !important;
+ }
+ .section-content {
+ color: black !important;
+ }
+}
.user-banner {
border-radius: $border-radius-root;
@@ -108,9 +120,6 @@ export default {
background: none !important;
}
}
- & ::v-deep .subhead {
- color: map-get($material-dark, "text-color") !important;
- }
.banner-row > * {
border-right: 1px solid $p1-light-green;
diff --git a/src/components/UserSelect.vue b/src/components/UserSelect.vue
index 5b787f83fd90b7297d3eab0f61acd8adf0b0f07b..9f9d263b8fefce714a79c4a1fc680de1f05a3677 100644
--- a/src/components/UserSelect.vue
+++ b/src/components/UserSelect.vue
@@ -125,17 +125,13 @@ export default {
},
created() {
if (this.value) {
- this.values = this.value;
- this.model = this.value;
- this.items = this.value;
+ this.setValues(this.value);
}
},
watch: {
- value() {
- if (this.value) {
- this.values = this.value;
- this.model = this.value;
- this.items = this.value;
+ value(val) {
+ if (val) {
+ this.setValues(val);
}
},
search(val) {
@@ -145,6 +141,11 @@ export default {
},
},
methods: {
+ setValues(val) {
+ this.values = val;
+ this.model = val;
+ this.items = val;
+ },
compareSelectedUsers(userA, userB) {
if (!userB || !userA) return false;
return userA === userB;
diff --git a/src/components/WelcomeSummary.vue b/src/components/WelcomeSummary.vue
index 7338b005b8c0b659e2666e3891aa1e2b1dce630d..cd210300fa175119c2a927a3938f05248b84f746 100644
--- a/src/components/WelcomeSummary.vue
+++ b/src/components/WelcomeSummary.vue
@@ -1,5 +1,5 @@
-
+
-
-
-
-
- mdi-refresh
-
-
- Refresh
-
-
+
-
-
+
+
DOWNLOAD GUIDE
@@ -25,12 +25,11 @@
-
-
-
-
-
-
My Projects
- -- ABMS ADCE Party Bus Survival Guide -
+INFORMATION
+
- Background information about Platform One, Agile & UCD
+ Background information about Platform One, Agile & UCD
philosophies, what the team does, security practices and
processes, etc.
LINKS
+LINKS
Training Resources
+VIDEOS
+VIDEOS
Self-Learning Videos
+
Kubernetes -
@@ -217,12 +215,6 @@ export default {
}
}
}
- .link-column a {
- color: #12b5f6 !important;
- &:hover {
- color: #12b5f6 !important;
- }
- }
}
.theme--dark {
.section {
@@ -238,11 +230,5 @@ export default {
}
}
}
- .link-column a {
- color: #12b5f6 !important;
- &:hover {
- color: lighten(#12b5f6, 10%) !important;
- }
- }
}
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index acce2e730cd8a51ab4f101c413d4efc63ff17344..87b7150d43b188e772c5abba825489f90490c887 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -3,10 +3,7 @@
-
-
diff --git a/src/views/Team.vue b/src/views/Team.vue
index 049ed1eb3ab7c7bde24a55c599ed2fb018bcc314..e6a44f2976ab0f35cfcb16e383ebfc47a6cc16b0 100644
--- a/src/views/Team.vue
+++ b/src/views/Team.vue
@@ -36,7 +36,16 @@
/>
- Launchboard Settings -
+
@@ -51,7 +60,7 @@
Add Team Member
@@ -179,6 +188,7 @@
@{{ item.username }}
@@ -256,15 +266,10 @@
top
v-if="membersToAdd"
v-model="snackbars.add"
- :timeout="5000"
+ :timeout="snackbars.timeout"
>
+
-
+
-
+
Add Student
-
+
-
- Edit {{ trainingCourse.name }}
+
+
@@ -215,9 +227,7 @@
-
-
-
Cancel
@@ -233,6 +243,13 @@
+
+
-
@@ -306,6 +311,7 @@ export default {
timeout: defaultSnackbarTimeout,
},
state: {
+ addMemberMessage: null,
// edit team details flags
showEditDialog: false,
isEditingTeamDetailsBusy: false,
@@ -435,6 +441,11 @@ export default {
this.$route.params.teamId
);
this.snackbars.add = true;
+ if (this.membersToAdd.length === 1) {
+ this.state.addMemberMessage = `${this.membersToAdd[0].name} added to ${this.team.name}`;
+ } else {
+ this.state.addMemberMessage = `${this.membersToAdd.length} added to ${this.team.name}`;
+ }
} catch (e) {
this.$store.commit(SET_ERROR_MESSAGE, e);
this.$store.commit(SET_ERROR_DIALOG, true);
@@ -513,12 +524,6 @@ export default {
// TODO: pull this from user info
return true;
},
- availableSlots() {
- if (this.team && this.team.members) {
- return this.team.capacity - this.team.members.length;
- }
- return -1;
- },
emailSelectedHref() {
if (this.selectedMembers.length === 0) {
return null;
diff --git a/src/views/TrainingDetails.vue b/src/views/TrainingDetails.vue
index 311b451e08bf974f315300170571d587e573455f..a1060e3f868a95206ea8d91d9e7a7a7fcf68e6f8 100644
--- a/src/views/TrainingDetails.vue
+++ b/src/views/TrainingDetails.vue
@@ -6,13 +6,13 @@
type="table-heading,table-thead, table-tbody"
class="py-2"
>
-
- {{ membersToAdd[0].name }} added to {{ team.name }}
-
-
- {{ membersToAdd.length }} members added to {{ team.name }}
-
+ {{ state.addMemberMessage }}
+
{{ trainingCourse.name }}
+ 
+
+
+ Edit Course Details
+
+
+ {{ trainingCourse.instructor }} +
+
@@ -259,7 +276,7 @@
-
+
Add Student
@@ -297,10 +315,54 @@
>
+
+ + {{ trainingCourse.startDate }} + to + {{ trainingCourse.endDate }} +
++ {{ trainingCourse.description }} +
+
+
+
-
+
+
+
+ {{ trainingCourse.registrations.length }} /
+ {{ trainingCourse.capacity }}
+
+
-
+
mdi-pencil
Edit Course
@@ -338,7 +400,9 @@ export default {
trainingCourseSnapshot: {},
selectedInstructorsSnapshot: [],
listItems: [],
+ expanded: [],
inputRules,
+ mobileBreakpoint: 800,
valid: true,
trigger: 0,
studentToAdd: [],
@@ -373,6 +437,10 @@ export default {
sortable: false,
},
],
+ mobileHeader: [
+ { text: "Instructor", value: "name", width: "200px", sortable: false },
+ { value: "data-table-expand", width: "20px", align: "right" },
+ ],
startDateMenu: false,
endDateMenu: false,
todaysDate: moment(), // cannot be formatted if used with diff comparison in courseProgress
@@ -421,6 +489,12 @@ export default {
return 0;
}
},
+ onMobile() {
+ return this.$vuetify.breakpoint.width < this.mobileBreakpoint;
+ },
+ header() {
+ return this.onMobile ? this.mobileHeader : this.pocHeaders;
+ },
},
async mounted() {
this.initialLoad = true;
@@ -533,13 +607,18 @@ export default {
#alternate-progress-bar-parent {
height: 8px;
}
+.availability-bar {
+ min-width: 120px;
+ width: 120px;
+}
#alternate-progress-bar-complete > div.primary {
/* overriding green progress bar */
background-color: var(--v-primary-base) !important;
}
-
-#training-table .availability-bar {
- width: 100% !important;
+#training-table {
+ .availability-bar {
+ width: 100% !important;
+ }
}
diff --git a/src/views/super-admin/LaunchboardSuperAdmin.vue b/src/views/super-admin/LaunchboardSuperAdmin.vue
index c2d78a00d85942c5eac9c5641849c54edb7a85b0..7216016422ceecddc388cb61ba5b399ff9cd9c3b 100644
--- a/src/views/super-admin/LaunchboardSuperAdmin.vue
+++ b/src/views/super-admin/LaunchboardSuperAdmin.vue
@@ -9,26 +9,30 @@
:position="user.affiliation"
:avatar="user.avatar"
/>
-
-
-
-
+
-
-
-
-
+
@@ -37,42 +41,67 @@
lg="6"
class="d-flex flex-column py-0 pt-lg-3 monthlyseats"
>
-
-
-
-
-
-
+
+
+
@@ -82,27 +111,42 @@
-
diff --git a/src/views/super-admin/Personnel.vue b/src/views/super-admin/Personnel.vue
index 398d4ff02c7ab7ab0a17853d624069a94980baf8..e377e397d0d2052b5003e02559c20a6a024def2b 100644
--- a/src/views/super-admin/Personnel.vue
+++ b/src/views/super-admin/Personnel.vue
@@ -1,79 +1,58 @@
-
- - Welcome to Platform One -
+My Courses
-- Curriculum Schedules -
-Remaining Seats
-- Past Monthly Seat Metrics -
+- Present Monthly Seat Metrics -
+- Future Monthly Seat Metrics -
+
-
+
-
+
+
+
-
@@ -157,19 +138,21 @@
-
diff --git a/src/views/super-admin/Teams.vue b/src/views/super-admin/Teams.vue
index 6dc7359b1818cb4dcedc3cad93bfc1cab96cea82..c2d8608827dffebdcbdc0557310d340adff76a4b 100644
--- a/src/views/super-admin/Teams.vue
+++ b/src/views/super-admin/Teams.vue
@@ -81,6 +81,7 @@
{{ lead.name }}
@@ -95,6 +96,7 @@
{{ lead.email }}
@@ -110,20 +112,6 @@
{{ item.endDate }}
-
-
-
+
+
+
+
+
- Filter
+
-
-
-
-
- Export List
-
-
-
-
- Export List
-
-
-
-
+
-
-
- Cancel
-
-
- Export List
-
-
-
-
-
-
-
+
+
+ Upgrade Permission
+
+
Add new Personnel
@@ -137,19 +117,20 @@
-
-
-
-
-
- {{ item.memberCount }} / {{ item.capacity }}
-
-
@@ -255,7 +243,7 @@ export default {
{
text: "Members",
value: "memberCount",
- width: "200px",
+ width: "20px",
sortable: false,
},
],
diff --git a/src/views/super-admin/Training.vue b/src/views/super-admin/Training.vue
index d7004aa31e3766a8792223a8e3492486fa9580b4..7132ee8ff2f71986a42c082b16f02c10de519ba0 100644
--- a/src/views/super-admin/Training.vue
+++ b/src/views/super-admin/Training.vue
@@ -7,7 +7,7 @@
>
-
-
{{ item.name }}
-
+
Filter
+Filter
{{ instructor.name }}
-
+
{{ item.startDate }}
-
+
+
+
+
+
+
+ mdi-email
+
+
+ Email both Instructors
+
+
+
+
+
+
+
{{ item.endDate }}
-
-
+
+
+ {{ instructor.name }}
+
+ ,
+
+
+
+ {{ item.startDate }}
+ to
+ {{ item.endDate }}
+
+
+ {{ item.registeredCount }} / {{ item.capacity }}
+
+
@@ -314,6 +385,7 @@ export default {
},
data: () => ({
search: null,
+ expanded: [],
darkMode: null,
initialLoad: true,
lastOptions: null,
@@ -364,9 +436,14 @@ export default {
sortable: false,
},
],
+ mobileHeaders: [
+ { value: "name", color: "green", width: "100%" },
+ { value: "data-table-expand", width: "20px" },
+ ],
selectedCourses: [],
deletingCourses: [],
courseToAdd: null,
+ mobileBreakpoint: 800,
}),
watch: {
options: {
@@ -473,7 +550,6 @@ export default {
this.fetchingData = false;
}
},
-
async addCourse(toAdd) {
this.state.isAddingBusy = true;
@@ -547,26 +623,30 @@ export default {
return `${this.deletingCourses[0].name} removed`;
}
},
+ onMobile() {
+ return this.$vuetify.breakpoint.width < this.mobileBreakpoint;
+ },
+ header() {
+ return this.onMobile ? this.mobileHeaders : this.headers;
+ },
},
};
diff --git a/src/views/user/LaunchboardUser.vue b/src/views/user/LaunchboardUser.vue
index 08dae21344e21af3069d6f68805a8fc376968380..957427f9aa5e7329642badce491d63ee791337e0 100644
--- a/src/views/user/LaunchboardUser.vue
+++ b/src/views/user/LaunchboardUser.vue
@@ -12,28 +12,39 @@
:position="user.affiliation"
:avatar="user.avatar"
/>
-
-
- Welcome to
+
-
-
+
-
-
+
+
@@ -42,29 +53,16 @@
lg="6"
class="d-flex flex-column py-0 pt-lg-3 mt-6 mt-lg-0"
>
-
-
+
-
-
-
-
-
- mdi-refresh
-
-
- Refresh
-
-
-
-
+
+
@@ -105,8 +105,8 @@ import CurriculumSchedule from "@/components/CurriculumSchedule";
import ProjectsSummary from "@/components/ProjectsSummary";
import HelpDeskSummary from "@/components/HelpDeskSummary";
import ToolsSummary from "@/components/ToolsSummary";
-import WelcomeSummary from "@/components/WelcomeSummary";
import TutorialTooltip from "@/components/TutorialTooltip";
+import WelcomeSummary from "@/components/WelcomeSummary";
import WelcomeTutorialModal from "@/components/WelcomeTutorialModal";
export default {
@@ -116,15 +116,16 @@ export default {
CurriculumSchedule,
ProjectsSummary,
HelpDeskSummary,
+ TutorialTooltip,
ToolsSummary,
WelcomeSummary,
- TutorialTooltip,
WelcomeTutorialModal,
},
name: "launchboard-user-dashboard",
data: () => ({
user: {},
loadingProjectData: false,
+ loadingCurriculumData: false,
displayTutorialModal: true,
}),
mounted() {
@@ -134,9 +135,15 @@ export default {
refreshProjectData() {
this.$refs.projectSummary.refreshProjects();
},
+ refreshCurriculumSchedule() {
+ this.$refs.curriculumSchedule.refreshCurriculumSchedule();
+ },
setProjectLoading(loading) {
this.loadingProjectData = loading;
},
+ setCurriculumSchedule(loading) {
+ this.loadingCurriculumData = loading;
+ },
setDisplayTutorialModal(value) {
this.displayTutorialModal = value;
},
diff --git a/tests/e2e/fixtures/api/myTeams.json b/tests/e2e/fixtures/api/myTeams.json
index 10f852ce8f3ad602344af9ccb3ad6ea30f90e856..4a0904f25ffed7a02c5280b4231ecffe0f17cdae 100644
--- a/tests/e2e/fixtures/api/myTeams.json
+++ b/tests/e2e/fixtures/api/myTeams.json
@@ -4,7 +4,6 @@
"id": 1,
"name": "Test Team",
"description": "This is a test team",
- "capacity": 10,
"createdAt": "2021-05-10T00:00:00.000Z",
"updatedAt": "2021-05-10T00:00:00.000Z",
"deletedAt": null,
diff --git a/tests/e2e/fixtures/api/teams.json b/tests/e2e/fixtures/api/teams.json
index cc632c9bc1cc1fabe32329415f4164d4391bd9d9..16d8d9da89d61cbd79ffa56117690843c4950c57 100644
--- a/tests/e2e/fixtures/api/teams.json
+++ b/tests/e2e/fixtures/api/teams.json
@@ -3,7 +3,6 @@
"id": 1,
"name": "Test Team",
"description": "This is a test team",
- "capacity": 10,
"createdAt": "2021-05-10T00:00:00.000Z",
"updatedAt": "2021-05-10T00:00:00.000Z",
"deletedAt": null,
diff --git a/tests/e2e/fixtures/api/teamsList.json b/tests/e2e/fixtures/api/teamsList.json
index c825e0b375a3d9606e32a391dde49a0eb724ab21..a4e8106749dea17ef290d5e0b8a67d4c332d61b7 100644
--- a/tests/e2e/fixtures/api/teamsList.json
+++ b/tests/e2e/fixtures/api/teamsList.json
@@ -13,7 +13,6 @@
"id": 1,
"name": "Test Team 1",
"description": "This is a test team",
- "capacity": 10,
"createdAt": "2021-05-10T00:00:00.000Z",
"updatedAt": "2021-05-10T00:00:00.000Z",
"deletedAt": null,
@@ -24,7 +23,6 @@
"id": 2,
"name": "Test Team 2",
"description": "This is a test team",
- "capacity": 10,
"createdAt": "2021-05-10T00:00:00.000Z",
"updatedAt": "2021-05-10T00:00:00.000Z",
"deletedAt": null,
diff --git a/tests/unit/components/AdminCourses.spec.js b/tests/unit/components/AdminCourses.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..a36c78c1941eb568723358f5bfdb1e2cef259ae2
--- /dev/null
+++ b/tests/unit/components/AdminCourses.spec.js
@@ -0,0 +1,64 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils";
+import TrainingService from "@/api/services/training";
+import AdminCourses from "@/components/AdminCourses.vue";
+import flushPromises from "flush-promises";
+import Vuex from "vuex";
+import Vuetify from "vuetify";
+
+const vuetify = new Vuetify();
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe("AdminCourses", () => {
+ const mockCourses = [
+ { course: { name: "course1" } },
+ { course: { name: "course2" } },
+ ];
+ const mockError = "mock error";
+
+ const store = new Vuex.Store({
+ state: {
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ },
+ },
+ });
+
+ it("should get schedule from api", async () => {
+ TrainingService.getCourses = jest
+ .fn()
+ .mockResolvedValue({ courses: mockCourses });
+
+ const wrapper = shallowMount(AdminCourses, {
+ mocks: {
+ $vuetify: { breakpoint: { xsOnly: true } },
+ },
+ vuetify,
+ store,
+ localVue,
+ });
+
+ await flushPromises();
+ expect(wrapper.vm.schedule).toEqual(mockCourses);
+ });
+
+ it("should set error message on error", async () => {
+ console.error = jest.fn(); // mock console.error when expecting error messages
+
+ TrainingService.getCourses = jest.fn().mockRejectedValue(mockError);
+ const wrapper = shallowMount(AdminCourses, {
+ mocks: {
+ $vuetify: { breakpoint: { xsOnly: true } },
+ },
+ vuetify,
+ store,
+ localVue,
+ });
+ await flushPromises();
+
+ expect(wrapper.vm.errorMessage).toEqual(mockError);
+ });
+});
diff --git a/tests/unit/components/MonthlySeatMetric.spec.js b/tests/unit/components/MonthlySeatMetric.spec.js
index f27f53d9ed859d2d7f4251ec21f340f714f0f532..d8d9d20ed724e814191b0beecd4835380f486f6f 100644
--- a/tests/unit/components/MonthlySeatMetric.spec.js
+++ b/tests/unit/components/MonthlySeatMetric.spec.js
@@ -36,6 +36,11 @@ describe("components/MonthlySeatMetric", () => {
$store: {
state: {
error: {},
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ },
},
commit: jest.fn(),
},
@@ -76,6 +81,11 @@ describe("components/MonthlySeatMetric", () => {
$store: {
state: {
error: {},
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ },
},
commit: jest.fn(),
},
@@ -117,6 +127,11 @@ describe("components/MonthlySeatMetric", () => {
$store: {
state: {
error: {},
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ },
},
commit: jest.fn(),
},
@@ -158,6 +173,11 @@ describe("components/MonthlySeatMetric", () => {
$store: {
state: {
error: {},
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ },
},
commit: jest.fn(),
},
@@ -193,6 +213,11 @@ it("should throw error", async () => {
$store: {
state: {
error: {},
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ },
},
commit: jest.fn(),
},
diff --git a/tests/unit/components/PersonnelTable.spec.js b/tests/unit/components/PersonnelTable.spec.js
index f283c818502b3d90de95049372aeb62ec0c7647a..9f7556416d3ba77254d1fe3b769c2f0790c73d9c 100644
--- a/tests/unit/components/PersonnelTable.spec.js
+++ b/tests/unit/components/PersonnelTable.spec.js
@@ -5,7 +5,8 @@ import PersonnelTable from "@/components/PersonnelTable.vue";
import UserService from "@/api/services/user";
import Permission from "@/config/user-permissions";
import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
-
+import Vuetify from "vuetify";
+const vuetify = new Vuetify();
const localVue = createLocalVue();
localVue.use(Vuex);
@@ -17,6 +18,36 @@ describe("PersonnelTable", () => {
{ id: 2, MemberOfTeams: [{ name: "Bullhorn" }, { name: "Ranchero" }] },
],
};
+ const defaultMock = {
+ mocks: {
+ $vuetify: { theme: { dark: false }, breakpoint: { width: 800 } },
+ $store: {
+ commit: jest.fn(),
+ state: {
+ user: {
+ user: { name: "mock user", permission: Permission.USER },
+ },
+ error: {},
+ tutorial: {},
+ userPreferences: {
+ userPreference: {
+ darkMode: true,
+ },
+ },
+ },
+ },
+ },
+ data() {
+ return {
+ personnel: {
+ listItems: [{ id: 1 }],
+ },
+ params: {},
+ };
+ },
+ localVue,
+ vuetify,
+ };
afterEach(() => {
jest.resetAllMocks();
@@ -29,35 +60,7 @@ describe("PersonnelTable", () => {
UserService.updateUserPersonnelType = jest.fn().mockResolvedValue([]);
- const wrapper = shallowMount(PersonnelTable, {
- mocks: {
- $vuetify: { theme: { dark: false } },
- $store: {
- commit: jest.fn(),
- state: {
- user: {
- user: { name: "mock user", permission: Permission.USER },
- },
- error: {},
- tutorial: {},
- userPreferences: {
- userPreference: {
- darkMode: true,
- },
- },
- },
- },
- },
- data() {
- return {
- personnel: {
- listItems: [{ id: 1 }],
- },
- params: {},
- };
- },
- localVue,
- });
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
await wrapper.vm.removePersonnel();
@@ -78,35 +81,7 @@ describe("PersonnelTable", () => {
.fn()
.mockRejectedValue("mock error");
- const wrapper = shallowMount(PersonnelTable, {
- mocks: {
- $vuetify: { theme: { dark: false } },
- $store: {
- commit: jest.fn(),
- state: {
- user: {
- user: { name: "mock user", permission: Permission.USER },
- },
- error: {},
- tutorial: {},
- userPreferences: {
- userPreference: {
- darkMode: true,
- },
- },
- },
- },
- },
- data() {
- return {
- personnel: {
- listItems: [{ id: 1 }],
- },
- params: {},
- };
- },
- localVue,
- });
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
await wrapper.vm.removePersonnel();
@@ -126,7 +101,7 @@ describe("PersonnelTable", () => {
.mockResolvedValue(mockUsersResponse);
window.open = jest.fn();
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
wrapper.vm.sendEmailToPersonnel();
expect(window.open).toHaveBeenCalledTimes(1);
@@ -137,7 +112,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
await wrapper.vm.fetchData({});
expect(wrapper.vm.personnel.listItems).toEqual(mockUsersResponse.users);
});
@@ -147,7 +122,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue({ users: [], meta: { total: 0 } });
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
await wrapper.vm.fetchData({ personnelType: "test" });
expect(wrapper.vm.personnel.listItems).toEqual([]);
});
@@ -157,7 +132,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
wrapper.vm.personnel.listItems = [{ id: 1 }];
expect(wrapper.vm.getPersonnelListItems()).toEqual([{ id: 1 }]);
});
@@ -171,35 +146,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable, {
- mocks: {
- $vuetify: { theme: { dark: false } },
- $store: {
- commit: jest.fn(),
- state: {
- user: {
- user: { name: "mock user", permission: Permission.USER },
- },
- error: {},
- tutorial: {},
- userPreferences: {
- userPreference: {
- darkMode: true,
- },
- },
- },
- },
- },
- data() {
- return {
- personnel: {
- listItems: [{ id: 1 }],
- },
- params: {},
- };
- },
- localVue,
- });
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
await wrapper.vm.updateUserPermissions({ name: "mock user2" });
expect(UserService.updateUserPermission).toHaveBeenCalled();
});
@@ -213,35 +160,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable, {
- mocks: {
- $vuetify: { theme: { dark: false } },
- $store: {
- commit: jest.fn(),
- state: {
- user: {
- user: { name: "mock user", permission: Permission.USER },
- },
- error: {},
- tutorial: {},
- userPreferences: {
- userPreference: {
- darkMode: true,
- },
- },
- },
- },
- },
- data() {
- return {
- personnel: {
- listItems: [{ id: 1 }],
- },
- params: {},
- };
- },
- localVue,
- });
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
await wrapper.vm.updateUserPermissions({ name: "mock user" });
expect(UserService.updateUserPermission).toHaveBeenCalledTimes(0);
});
@@ -251,7 +170,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
expect(wrapper.vm.permissionTypesDropdown).toEqual([
{ text: "Super Admin", value: "Super Admin" },
{ text: "Admin", value: "Admin" },
@@ -263,7 +182,12 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, {
+ mocks: {
+ $vuetify: { theme: { dark: false }, breakpoint: { width: 800 } },
+ },
+ vuetify,
+ });
wrapper.vm.fetchData = jest.fn().mockResolvedValue({ test: "test" });
wrapper.vm.fetchDebounced();
await new Promise((resolve) => {
@@ -271,7 +195,6 @@ describe("PersonnelTable", () => {
resolve();
}, 1000);
});
- expect(wrapper.vm.fetchingData).toEqual(false);
expect(wrapper.vm.fetchData).toHaveBeenCalled();
});
it("should fetchData initialLoad false", async () => {
@@ -279,7 +202,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
wrapper.vm.fetchData = jest.fn().mockResolvedValue({ test: "test" });
wrapper.vm.fetchData({ personnelType: "test" });
expect(wrapper.vm.loading).toEqual(true);
@@ -289,7 +212,7 @@ describe("PersonnelTable", () => {
.fn()
.mockResolvedValue(mockUsersResponse);
- const wrapper = shallowMount(PersonnelTable);
+ const wrapper = shallowMount(PersonnelTable, defaultMock);
wrapper.vm.fetchDebounced = jest.fn();
// trigger the watch for wrapper.vm.options
@@ -313,7 +236,7 @@ describe("PersonnelTable", () => {
const wrapper = shallowMount(PersonnelTable, {
mocks: {
- $vuetify: { theme: { dark: false } },
+ $vuetify: { theme: { dark: false }, breakpoint: { width: 800 } },
$store: {
commit: jest.fn(),
state: {
@@ -339,6 +262,7 @@ describe("PersonnelTable", () => {
};
},
localVue,
+ vuetify,
});
wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
@@ -362,7 +286,7 @@ describe("PersonnelTable", () => {
const wrapper = shallowMount(PersonnelTable, {
mocks: {
- $vuetify: { theme: { dark: false } },
+ $vuetify: { theme: { dark: false }, breakpoint: { width: 800 } },
$store: {
commit: jest.fn(),
state: {
@@ -389,6 +313,7 @@ describe("PersonnelTable", () => {
};
},
localVue,
+ vuetify,
});
wrapper.vm.fetchData = jest.fn().mockResolvedValue({ test: "test" });
await wrapper.vm.cancelUserPermissionChange();
@@ -403,7 +328,7 @@ describe("PersonnelTable", () => {
const wrapper = shallowMount(PersonnelTable, {
mocks: {
- $vuetify: { theme: { dark: false } },
+ $vuetify: { theme: { dark: false }, breakpoint: { width: 800 } },
$store: {
commit: jest.fn(),
state: {
@@ -431,6 +356,7 @@ describe("PersonnelTable", () => {
};
},
localVue,
+ vuetify,
});
wrapper.vm.setUserPermissions = jest.fn();
await wrapper.vm.confirmUserPermissionChange();
diff --git a/tests/unit/views/Team.spec.js b/tests/unit/views/Team.spec.js
index 5184e64f37edc715aa42d65256f96841b0bebfac..5d37d1d5a3de462ad82b4e013d6a91c477a246c1 100644
--- a/tests/unit/views/Team.spec.js
+++ b/tests/unit/views/Team.spec.js
@@ -284,59 +284,6 @@ describe("Team", () => {
).toEqual("User is already a member of this team");
});
});
- describe("availableSlots", () => {
- it("should compute availableSlots when empty", async () => {
- // empty state
- TeamService.getTeamForUser = jest
- .fn()
- .mockResolvedValue({ name: "mock" });
- const wrapper = shallowMount(Team, {
- mocks: {
- $vuetify: { theme: { dark: true } },
- $route,
- $store: {
- state: {
- error: {},
- user: {
- user: { name: "mock user", permission: Permission.ADMIN },
- },
- },
- commit: jest.fn(),
- },
- },
- localVue,
- vuetify,
- });
- await flushPromises();
- expect(wrapper.vm.availableSlots).toEqual(-1);
- });
- it("should compute availableSlots", async () => {
- TeamService.getTeam = jest.fn().mockResolvedValue({
- name: "mock",
- capacity: 3,
- members: [{}, {}],
- });
- const wrapper = shallowMount(Team, {
- mocks: {
- $vuetify: { theme: { dark: true } },
- $route,
- $store: {
- state: {
- user: {
- user: { name: "mock user", permission: Permission.ADMIN },
- },
- error: {},
- },
- commit: jest.fn(),
- },
- },
- localVue,
- vuetify,
- });
- await flushPromises();
- expect(wrapper.vm.availableSlots).toEqual(1);
- });
- });
it("should compute emailSelectedHref", async () => {
TeamService.getTeam = jest.fn().mockResolvedValue({ name: "mock" });
const wrapper = shallowMount(Team, {
diff --git a/tests/unit/views/super-admin/LaunchboardSuperAdmin.spec.js b/tests/unit/views/super-admin/LaunchboardSuperAdmin.spec.js
index f948cbc9dd45a2dc4bdc8b63421e4b7b35f52c91..811cf9e569fb471ec0bfb4ae071caca2a9ed1a59 100644
--- a/tests/unit/views/super-admin/LaunchboardSuperAdmin.spec.js
+++ b/tests/unit/views/super-admin/LaunchboardSuperAdmin.spec.js
@@ -1,31 +1,107 @@
import { shallowMount, createLocalVue } from "@vue/test-utils";
import Vuex from "vuex";
+import Permission from "@/config/user-permissions";
+import Vuetify from "vuetify";
import LaunchboardSuperAdmin from "@/views/super-admin/LaunchboardSuperAdmin.vue";
+import LoadingStore from "@/store/modules/loading";
+
+const vuetify = new Vuetify();
const localVue = createLocalVue();
localVue.use(Vuex);
-describe("LaunchboardAdmin", () => {
- it("should get user from store", async () => {
- const wrapper = shallowMount(
- LaunchboardSuperAdmin,
- {
- mocks: {
- $store: {
- state: {
- error: {},
- user: {
- user: { name: "mock user" },
- },
- userPreferences: { userPreference: {} },
- },
- commit: jest.fn(),
- },
+describe("LaunchboardSuperAdmin", () => {
+ const state = LoadingStore.state();
+ const store = new Vuex.Store({
+ state: {
+ user: {
+ user: { name: "mock user", permission: Permission.SUPER_ADMIN },
+ },
+ userPreferences: {
+ userPreference: {
+ darkMode: true,
+ welcomeMessage: true,
},
},
- localVue
- );
- console.log("store", wrapper.vm.$store);
- expect(wrapper.vm.user.name).toEqual("mock user");
+ loading: {
+ pastMetricState: false,
+ presentMetricState: false,
+ futureMetricState: false,
+ courseState: false,
+ },
+ },
+ });
+
+ it("should get user from store", async () => {
+ const wrapper = shallowMount(LaunchboardSuperAdmin, {
+ mocks: {
+ $vuetify: { breakpoint: { xsOnly: true } },
+ },
+ vuetify,
+ store,
+ localVue,
+ });
+ expect(wrapper.vm.user).toEqual({
+ name: "mock user",
+ permission: Permission.SUPER_ADMIN,
+ });
+ });
+
+ it("should refresh course data", async () => {
+ const wrapper = shallowMount(LaunchboardSuperAdmin, {
+ mocks: {
+ $vuetify: { breakpoint: { xsOnly: true } },
+ },
+ vuetify,
+ store,
+ localVue,
+ });
+
+ wrapper.vm.user = {
+ auth: {
+ newUser: true,
+ },
+ };
+
+ wrapper.vm.$refs.myCoursesRefresh.refreshMyCourses = jest.fn();
+ wrapper.vm.refreshMyCourseData();
+
+ expect(state.courseState).toEqual(false);
+ expect(wrapper.vm.getCourseState).toEqual(state.courseState);
+ });
+
+ it("should refresh all seat metric data", async () => {
+ const wrapper = shallowMount(LaunchboardSuperAdmin, {
+ mocks: {
+ $vuetify: { breakpoint: { xsOnly: true } },
+ },
+ vuetify,
+ store,
+ localVue,
+ });
+
+ wrapper.vm.user = {
+ auth: {
+ newUser: true,
+ },
+ };
+
+ wrapper.vm.$refs.seatMetricsPast.refreshSeatMetrics = jest.fn();
+ wrapper.vm.refreshPastSeatMetricsData();
+
+ wrapper.vm.$refs.seatMetricsPresent.refreshSeatMetrics = jest.fn();
+ wrapper.vm.refreshPresentSeatMetricsData();
+
+ wrapper.vm.$refs.seatMetricsFuture.refreshSeatMetrics = jest.fn();
+ wrapper.vm.refreshFutureSeatMetricsData();
+
+ expect(state.pastMetricState).toEqual(false);
+ expect(wrapper.vm.getPastMetricState).toEqual(state.pastMetricState);
+
+ expect(state.presentMetricState).toEqual(false);
+ expect(wrapper.vm.getPresentMetricState).toEqual(state.presentMetricState);
+
+ expect(state.futureMetricState).toEqual(false);
+ expect(wrapper.vm.getFutureMetricState).toEqual(state.futureMetricState);
});
});
diff --git a/tests/unit/views/super-admin/Personnel.spec.js b/tests/unit/views/super-admin/Personnel.spec.js
index 3bdd9b21493b97e67da939f82fb9c3b2c8599904..085b5731eb05822cc05add0a3c8d221c46b3fa95 100644
--- a/tests/unit/views/super-admin/Personnel.spec.js
+++ b/tests/unit/views/super-admin/Personnel.spec.js
@@ -2,16 +2,23 @@
import { shallowMount } from "@vue/test-utils";
import Personnel from "@/views/super-admin/Personnel.vue";
import UserService from "@/api/services/user";
+import Vuetify from "vuetify";
jest.mock("downloadjs");
import download from "downloadjs";
+const vuetify = new Vuetify();
-describe("LaunchboardAdmin", () => {
+describe("Personnel SuperAdmin", () => {
afterEach(() => {
jest.clearAllMocks();
});
it("should get user and toggle loading state", async () => {
- const wrapper = shallowMount(Personnel);
+ const wrapper = shallowMount(Personnel, {
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ },
+ vuetify,
+ });
expect(wrapper.vm.state.isLoading).toBe(true);
// wait for debounce to trigger
@@ -29,6 +36,11 @@ describe("LaunchboardAdmin", () => {
refreshAll: jest.fn(),
refreshFilters: jest.fn(),
},
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ $store: { state: { user: { user: {} } } },
+ },
+ vuetify,
});
UserService.updateUserPersonnelType = jest.fn(() => null);
wrapper.vm.$refs.userSelect = {
@@ -72,7 +84,12 @@ describe("LaunchboardAdmin", () => {
it("should cancel add personnel", async () => {
UserService.updateUserPermission = jest.fn().mockResolvedValue([]);
- const wrapper = shallowMount(Personnel);
+ const wrapper = shallowMount(Personnel, {
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ },
+ vuetify,
+ });
wrapper.vm.cancelAddPersonnel();
expect(wrapper.vm.personnel.userSelect.personnelToAdd).toEqual([]);
expect(wrapper.vm.personnel.userSelect.isAddingPersonnel).toEqual(false);
@@ -103,7 +120,12 @@ describe("LaunchboardAdmin", () => {
// });
it("should get all list items", async () => {
- const wrapper = shallowMount(Personnel);
+ const wrapper = shallowMount(Personnel, {
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ },
+ vuetify,
+ });
wrapper.vm.personnel = {
userSelect: {},
@@ -147,7 +169,12 @@ describe("LaunchboardAdmin", () => {
// });
it("should return wrapped with quotes", async () => {
- const wrapper = shallowMount(Personnel);
+ const wrapper = shallowMount(Personnel, {
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ },
+ vuetify,
+ });
expect(wrapper.vm.wrapWithQuotes("test")).toEqual(`"test"`);
});
@@ -165,6 +192,10 @@ describe("LaunchboardAdmin", () => {
filterSelectedValue: "",
};
},
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ },
+ vuetify,
});
wrapper.setData({ filterSearchValue: "test", filterSelectedValue: "test" });
wrapper.vm.$refs.personnel = {
@@ -202,6 +233,10 @@ describe("LaunchboardAdmin", () => {
isExporting: false,
};
},
+ mocks: {
+ $vuetify: { breakpoint: {} },
+ },
+ vuetify,
});
wrapper.vm.getAllListItems = jest.fn(() => {
diff --git a/tests/unit/views/super-admin/Training.spec.js b/tests/unit/views/super-admin/Training.spec.js
index 40d62a2461adecb42c75dbe75ea876dde0c5c9cf..38798db615532ddacfb19b922492b4bcb0d79bd1 100644
--- a/tests/unit/views/super-admin/Training.spec.js
+++ b/tests/unit/views/super-admin/Training.spec.js
@@ -27,6 +27,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
});
wrapper.vm.fetchDebounced();
@@ -49,6 +50,37 @@ describe("Training", () => {
});
expect(TrainingService.getCourses).toHaveBeenCalledTimes(2);
});
+ it("should debounce searchCourses", async () => {
+ TrainingService.getCourses = jest.fn().mockResolvedValue(mockCoursesResult);
+ const wrapper = shallowMount(Training, {
+ created() {
+ this.$vuetify.lang = {
+ t: () => {},
+ };
+ this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
+ },
+ });
+ wrapper.vm.fetchSearchDebounced();
+ wrapper.vm.fetchSearchDebounced();
+ wrapper.vm.fetchSearchDebounced();
+
+ // wait for debounce to trigger
+ await new Promise((resolve) => {
+ setTimeout(resolve, 500);
+ });
+
+ expect(TrainingService.getCourses).toHaveBeenCalledTimes(1);
+
+ wrapper.vm.fetchSearchDebounced();
+ wrapper.vm.fetchSearchDebounced();
+ wrapper.vm.fetchSearchDebounced();
+ // wait for debounce to trigger
+ await new Promise((resolve) => {
+ setTimeout(resolve, 500);
+ });
+ expect(TrainingService.getCourses).toHaveBeenCalledTimes(2);
+ });
it("should handle error on getCourses", async () => {
console.error = jest.fn(); // mock console.error when expecting error messages
TrainingService.getCourses = jest.fn().mockRejectedValue("mock error");
@@ -61,6 +93,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
mocks: {
$store: {
@@ -87,6 +120,44 @@ describe("Training", () => {
"mock error"
);
});
+ it("should handle error on getCourses in fetchSearchError", async () => {
+ console.error = jest.fn(); // mock console.error when expecting error messages
+ TrainingService.getCourses = jest.fn().mockRejectedValue("mock error");
+
+ const wrapper = shallowMount(
+ Training,
+ {
+ created() {
+ this.$vuetify.lang = {
+ t: () => {},
+ };
+ this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
+ },
+ mocks: {
+ $store: {
+ state: {
+ error: {},
+ },
+ commit: jest.fn(),
+ },
+ },
+ },
+ localVue
+ );
+ wrapper.vm.fetchSearchData();
+
+ // wait for debounce to trigger
+ await new Promise((resolve) => {
+ setTimeout(resolve, 500);
+ });
+
+ expect(wrapper.vm.fetchingSearch).toEqual(false);
+ expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(
+ SET_ERROR_MESSAGE,
+ "mock error"
+ );
+ });
it("should handle error on getCourses", async () => {
console.error = jest.fn(); // mock console.error when expecting error messages
@@ -100,6 +171,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
mocks: {
$store: {
@@ -136,6 +208,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 799 };
},
mocks: {
$store: {
@@ -173,6 +246,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
mocks: {
$store: {
@@ -207,6 +281,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
mocks: {
$store: {
@@ -235,6 +310,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
});
@@ -248,6 +324,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
});
wrapper.vm.deletingCourses = [{ name: "mock course 1" }];
@@ -267,6 +344,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
mocks: {
$store: {
@@ -302,6 +380,7 @@ describe("Training", () => {
t: () => {},
};
this.$vuetify.theme = { dark: true };
+ this.$vuetify.breakpoint = { width: 900 };
},
});
wrapper.vm.fetchDebounced = jest.fn();