Merge branch 'ji-typescript' into typescript

Author: Ji Kim

package-lock.json

@@ -69,6 +69,7 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.17.0",
+    "@pinia/testing": "^0.0.14",
     "@quasar/app": "^3.3.3",
     "@quasar/quasar-app-extension-testing-unit-jest": "^3.0.0-alpha.7",
     "@vue/devtools": "^6.0.12",

package.json

@@ -1,39 +1,73 @@
 import { mount, shallowMount } from "@vue/test-utils";
 import { createApp } from "vue";
+import { createTestingPinia } from "@pinia/testing";
 import * as All from "quasar";
 const { Quasar, date } = All;
-import actions from "../../../src/store/options/actions";
-import mutations from "../../../src/store/options/mutations";
-import * as types from "../../../src/store/options/types";
-import Vuex from "vuex";
-import store from "../../../src/store/state/index";
+import { useStore } from "../../../store/main.js";
 
+const store = useStore();
 //testing that export as typescript on/off, showTutorial, all update properly
 describe("Test for exportAsTypescript flag to flip when mutation committed", () => {
   const App = {};
   const app = createApp(App);
-  app.use(Quasar, Vuex);
-  const state = { ...store };
+  app.use(Quasar);
 
   //tests that the export as typescript mutation properly updates state to on/off
-  test('"[types.EXPORT_AS_TYPESCRIPT]" to update state successfully', () => {
-    mutations[types.EXPORT_AS_TYPESCRIPT](state, "on");
-    expect(state.exportAsTypescript).toEqual("on");
-    mutations[types.EXPORT_AS_TYPESCRIPT](state, "off");
-    expect(state.exportAsTypescript).toEqual("off");
+  test('"store.ExportAsTypescript" to update state successfully', () => {
+    store.ExportAsTypescript("on");
+    expect(this.ExportAsTypescript).toEqual("on");
+    store.ExportAsTypescript("off");
+    expect(this.exportAsTypescript).toEqual("off");
   });
 
-  //tests that the tutorial toggle successfully updates state to true/false
-  test('"[types.toggleTutorial]" action to commit TOGGLE_TUTORIAL', () => {
-    const commit = jest.fn();
-    actions[types.toggleTutorial]({ state, commit });
-    expect(commit).toHaveBeenCalledWith(types.TOGGLE_TUTORIAL);
-  });
-
-  test('"[types.TOGGLE_TUTORIAL]" to mutate state true/false', () => {
-    mutations[types.TOGGLE_TUTORIAL](state);
-    expect(state.showTutorial).toBe(false);
-    mutations[types.TOGGLE_TUTORIAL](state);
-    expect(state.showTutorial).toBe(true);
+  test('"store.toggleTutorial" to mutate state true/false', () => {
+    store.toggleTutorial();
+    expect(this.showTutorial).toBe(false);
+    store.toggleTutorial();
+    expect(this.showTutorial).toBe(true);
   });
 });
+
+
+
+
+// old VueX testing
+// import { mount, shallowMount } from "@vue/test-utils";
+// import { createApp } from "vue";
+// import * as All from "quasar";
+// const { Quasar, date } = All;
+// import actions from "../../../src/store/options/actions";
+// import mutations from "../../../src/store/options/mutations";
+// import * as types from "../../../src/store/options/types";
+// import Vuex from "vuex";
+// import store from "../../../src/store/state/index";
+
+// //testing that export as typescript on/off, showTutorial, all update properly
+// describe("Test for exportAsTypescript flag to flip when mutation committed", () => {
+//   const App = {};
+//   const app = createApp(App);
+//   app.use(Quasar, Vuex);
+//   const state = { ...store };
+
+//   //tests that the export as typescript mutation properly updates state to on/off
+//   test('"[types.EXPORT_AS_TYPESCRIPT]" to update state successfully', () => {
+//     mutations[types.EXPORT_AS_TYPESCRIPT](state, "on");
+//     expect(state.exportAsTypescript).toEqual("on");
+//     mutations[types.EXPORT_AS_TYPESCRIPT](state, "off");
+//     expect(state.exportAsTypescript).toEqual("off");
+//   });
+
+//   //tests that the tutorial toggle successfully updates state to true/false
+//   test('"[types.toggleTutorial]" action to commit TOGGLE_TUTORIAL', () => {
+//     const commit = jest.fn();
+//     actions[types.toggleTutorial]({ state, commit });
+//     expect(commit).toHaveBeenCalledWith(types.TOGGLE_TUTORIAL);
+//   });
+
+//   test('"[types.TOGGLE_TUTORIAL]" to mutate state true/false', () => {
+//     mutations[types.TOGGLE_TUTORIAL](state);
+//     expect(state.showTutorial).toBe(false);
+//     mutations[types.TOGGLE_TUTORIAL](state);
+//     expect(state.showTutorial).toBe(true);
+//   });
+// });