Skip to content

Commit

Permalink
Merge branch 'main' into BC-4623-Creation-and-update-status
Browse files Browse the repository at this point in the history
  • Loading branch information
Michaellinaresxk authored Sep 21, 2023
2 parents 808b45a + 488322e commit 51eaf42
Show file tree
Hide file tree
Showing 54 changed files with 1,386 additions and 686 deletions.
1 change: 0 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ module.exports = {
"!<rootDir>/src/pages/NewsCreate.page.vue",
"!<rootDir>/src/pages/NewsEdit.page.vue",
"!<rootDir>/src/pages/ProxyError.page.vue",
"!<rootDir>/src/pages/TermsOfUse.vue",
],

// maxWorkers: 2, // limited for not taking all workers within of a single github action
Expand Down
131 changes: 58 additions & 73 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/vuelidate": "^0.7.18",
"@vueuse/components": "^10.3.0",
"@vueuse/core": "^10.3.0",
"axios": "^1.1.3",
"axios": "^1.5.0",
"dayjs": "^1.11.9",
"flush-promises": "^1.0.2",
"katex": "^0.12.0",
Expand All @@ -30,7 +30,7 @@
"object-hash": "^3.0.0",
"tiptap": "^1.32.2",
"tiptap-extensions": "^1.35.2",
"universal-cookie": "^4.0.4",
"universal-cookie": "^6.1.1",
"vue": "^2.7.14",
"vue-dndrop": "github:hpi-schul-cloud/vue-dndrop#d78a541aa4840063c70ced401310c822d6f06361",
"vue-dompurify-html": "^4.1.4",
Expand All @@ -40,7 +40,7 @@
"vue-router": "^3.6.5",
"vuedraggable": "^2.24.3",
"vuelidate": "^0.7.7",
"vuetify": "^2.6.0",
"vuetify": "^2.7.1",
"vuex": "^3.6.2"
},
"devDependencies": {
Expand All @@ -65,15 +65,15 @@
"babel-jest": "^27.0.6",
"canvas": "^2.11.2",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^9.16.1",
"eslint-plugin-vue": "^9.17.0",
"fishery": "^2.2.2",
"http-proxy-middleware": "^2.0.6",
"jest": "^27.5.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"sass": "^1.64.1",
"sass": "^1.67.0",
"sass-loader": "^12.0.0",
"ts-jest": "^27.1.5",
"typescript": "~4.5.5",
Expand Down
8 changes: 6 additions & 2 deletions src/components/administration/AdminMigrationSection.unit.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import AdminMigrationSection from "@/components/administration/AdminMigrationSection.vue";
import EnvConfigModule from "@/store/env-config";
import SchoolsModule from "@/store/schools";
import { ENV_CONFIG_MODULE_KEY, I18N_KEY } from "@/utils/inject";
import {
ENV_CONFIG_MODULE_KEY,
I18N_KEY,
SCHOOLS_MODULE_KEY,
} from "@/utils/inject";
import { createModuleMocks } from "@/utils/mock-store-module";
import createComponentMocks from "@@/tests/test-utils/componentMocks";
import { Wrapper, mount, shallowMount } from "@vue/test-utils";
Expand Down Expand Up @@ -39,7 +43,7 @@ describe("AdminMigrationSection", () => {
}),
provide: {
[I18N_KEY.valueOf()]: i18nMock,
schoolsModule,
[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
},
});
Expand Down
Loading

0 comments on commit 51eaf42

Please sign in to comment.