From caa0ff1da836159e7e0ce05372b346d5f6de0c86 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 9 Dec 2022 14:20:28 -0600 Subject: [PATCH 1/5] Remove execute bit from non-executable files. --- .gitignore | 0 .jshintrc | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .jshintrc diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.jshintrc b/.jshintrc old mode 100755 new mode 100644 From 222c8ba587e139893aee183e51e25891ecb75933 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 9 Dec 2022 14:20:45 -0600 Subject: [PATCH 2/5] Issue 137: Security fixes for: minimatch and qs. Fix child dependencies that are coming in with insecure versions. This is based on the `npm list --depth=100` and considers what is reported by dependabot for Sage. see: https://github.com/TAMULib/SAGE/security/dependabot/37 see: https://github.com/TAMULib/SAGE/security/dependabot/34 --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ec0c89..086d4e7 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,8 @@ "devDependencies": { }, "overrides": { - "glob-stream": "^7.0.0" + "glob-stream": "^7.0.0", + "minimatch": "^3.1.2", + "qs": "^6.11.0" } } From 6200f7210a3bd4f1d1ca64bfbb3ac0031334a324 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 9 Dec 2022 14:40:57 -0600 Subject: [PATCH 3/5] Test is running on port 9000 and not 9001. --- tests/unit/controllers/activeSprintsControlerTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/controllers/activeSprintsControlerTest.js b/tests/unit/controllers/activeSprintsControlerTest.js index 2c2cfb3..027bbd6 100644 --- a/tests/unit/controllers/activeSprintsControlerTest.js +++ b/tests/unit/controllers/activeSprintsControlerTest.js @@ -116,7 +116,7 @@ describe("controller: ActiveSprintsController", function () { "name": "Ryan Laddusaw", "avatar": "no_avatar.png" }); - expect(avatarUrl).toEqual("http://localhost:9001/products/images/no_avatar.png"); + expect(avatarUrl).toEqual("http://localhost:9000/products/images/no_avatar.png"); }); it("getHtmlContent get trusted content", function () { From 19aee50a78cfd356fd597a99e82eb2765aa99add Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 9 Dec 2022 16:02:15 -0600 Subject: [PATCH 4/5] Work-around problem with the base href not being loaded during karma testing. --- tests/unit/controllers/activeSprintsControlerTest.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/unit/controllers/activeSprintsControlerTest.js b/tests/unit/controllers/activeSprintsControlerTest.js index 027bbd6..56b5849 100644 --- a/tests/unit/controllers/activeSprintsControlerTest.js +++ b/tests/unit/controllers/activeSprintsControlerTest.js @@ -35,6 +35,7 @@ describe("controller: ActiveSprintsController", function () { beforeEach(function () { module("core"); module("app"); + module("templates"); module("mock.activeSprintsService"); module("mock.statusRepo"); module("mock.user", function ($provide) { @@ -116,7 +117,12 @@ describe("controller: ActiveSprintsController", function () { "name": "Ryan Laddusaw", "avatar": "no_avatar.png" }); - expect(avatarUrl).toEqual("http://localhost:9000/products/images/no_avatar.png"); + + // Tests are not loading the base href. + // An error message like "$location in HTML5 mode requires a tag to be present" appears despite the index.html having a base path of ''. + // Remove the /products/ from the URL until such time the test process can be fixed. + // Adding the module("templates"); to load the templates above to load the HTML templates does not help any. + expect(avatarUrl).toEqual("http://localhost:9000/images/no_avatar.png"); }); it("getHtmlContent get trusted content", function () { From 833a1b5b319cb42506dcd3744994c513f5b0c94d Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Mon, 12 Dec 2022 15:57:17 -0600 Subject: [PATCH 5/5] wvr/core version to 2.2.2-rc.14 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 086d4e7..ed4a32a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "start": "wvr server --port 8080" }, "dependencies": { - "@wvr/core": "2.2.2-rc.13", + "@wvr/core": "2.2.2-rc.14", "ng-table": "3.0.1" }, "devDependencies": {