Skip to content

Commit

Permalink
Merge pull request #102 from foretagsplatsen/15549487/Get_rid_of_karm…
Browse files Browse the repository at this point in the history
…a_on_yaem
  • Loading branch information
DamienCassou committed Sep 4, 2023
2 parents 756a239 + 03033f6 commit 2ae1b75
Show file tree
Hide file tree
Showing 9 changed files with 171 additions and 1,437 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
cache: 'yarn'
- run: yarn install --frozen-lockfile
- run: yarn run lint
- run: xvfb-run yarn run test
- run: yarn run test
11 changes: 11 additions & 0 deletions jasmine.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"spec_dir": "test",

"spec_files": [
"**/*.test.js"
],

"env": {
"failSpecWithNoExpectations": true
}
}
55 changes: 0 additions & 55 deletions karma.conf.js

This file was deleted.

18 changes: 7 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
"name": "yaem",
"version": "0.1.0",
"description": "Event manager",
"main": "index.js",
"type": "module",
"exports": {
".": "./index.js"
},
"author": "finsit",
"license": "MIT",
"scripts": {
"lint": "eslint --report-unused-disable-directives .",
"test": "karma start"
"test": "jasmine --config=jasmine.json"
},
"devDependencies": {
"@foretagsplatsen/eslint-plugin-ftgp": "^2.1.1",
Expand All @@ -18,14 +21,7 @@
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-sort-class-members": "^1.18.0",
"jasmine": "^4.5.0",
"karma": "^6.4.2",
"karma-electron": "^7.3.0",
"karma-electron-launcher": "^0.3.0",
"karma-jasmine": "^5.1.0",
"karma-webpack": "^5.0.0",
"prettier": "^3.0.2",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4"
"jasmine": "^5.1.0",
"prettier": "^3.0.2"
}
}
2 changes: 1 addition & 1 deletion src/eventCategory.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import event from "./event";
import event from "./event.js";

/**
* Keeps a list of events.
Expand Down
2 changes: 1 addition & 1 deletion src/eventManager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import eventCategory from "./eventCategory";
import eventCategory from "./eventCategory.js";

/**
* Singleton object that keeps a list of named event categories.
Expand Down
6 changes: 3 additions & 3 deletions test/events.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import event from "../src/event";
import eventCategory from "../src/eventCategory";
import events from "../src/eventManager";
import event from "../src/event.js";
import eventCategory from "../src/eventCategory.js";
import events from "../src/eventManager.js";

describe("events", () => {
it("Bind callback to event", () => {
Expand Down

0 comments on commit 2ae1b75

Please sign in to comment.