Skip to content

Commit

Permalink
Upgraded qunit and qunit-dom and fixed the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@bp-cos
bp-cos committed Feb 13, 2025
1 parent 3ea546d commit 519bc79
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 34 deletions.
32 changes: 16 additions & 16 deletions ...mponents/addon/components/activity-log/-components/activity-log-display/component-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> edited description of A new project for testing file components</span>',
'Project edit description is correct',
);
Expand Down Expand Up @@ -91,7 +91,7 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> updated the license of A new project for testing file components Apache License 2.0</span>',
'Project edit description is correct',
);
Expand All @@ -116,8 +116,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> added file /hat.jpg to OSF Storage in A new project for testing file components',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> added file /hat.jpg to OSF Storage in A new project for testing file components</span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand All @@ -140,8 +140,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> removed file /hat.jpg from OSF Storage in A new project for testing file components',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> removed file /hat.jpg from OSF Storage in A new project for testing file components</span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand All @@ -164,8 +164,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> added tag Food to A new project for testing file components',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> added tag Food to A new project for testing file components</span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand All @@ -188,8 +188,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> updated metadata for the guid',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> updated metadata for the guid</span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand All @@ -213,8 +213,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> removed an anonymous view-only link to A new project for testing file components',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> removed an anonymous view-only link to A new project for testing file components</span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand All @@ -238,8 +238,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> created an anonymous view-only link to A new project for testing file components',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> created an anonymous view-only link to A new project for testing file components</span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand All @@ -262,8 +262,8 @@ module('Integration | Activity Log Display | Component | validate activity log',
@log={{this.mirageLog}}
/>
`);
assert.dom('[data-test-action-text]').hasText(
'<a href="/utu98/">Futa Geiger</a> created a link to analysis <a href="/ww3a2/">The linked node for testing</a>',
assert.dom('[data-test-action-text]').hasHtml(
'<span><a href="/utu98/">Futa Geiger</a> created a link to analysis <a href="/ww3a2/">The linked node for testing</a></span>',
);

assert.dom('[data-test-action-date]').hasText(
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@
"moment-timezone": "^0.5.43",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit-dom": "^1.6.0",
"qunit": "^2.24.1",
"qunit-dom": "^3.4.0",
"sass": "^1.26.3",
"seedrandom": "^3.0.1",
"sinon": "^12.0.1",
Expand Down
58 changes: 42 additions & 16 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10595,6 +10595,11 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"

dom-element-descriptors@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/dom-element-descriptors/-/dom-element-descriptors-0.5.1.tgz#3ebfcf64198f922dba928f84f7970bb571891317"
integrity sha512-DLayMRQ+yJaziF4JJX1FMjwjdr7wdTr1y9XvZ+NfHELfOMcYDnCHneAYXAS4FT1gLILh4V0juMZohhH1N5FsoQ==

dom-serializer@0:
version "0.2.2"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
Expand Down Expand Up @@ -20034,20 +20039,17 @@ quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quic
rimraf "^2.5.4"
underscore.string "~3.3.4"

qunit-dom@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-1.6.0.tgz#a4bea6a46329d221e4a317d712cb40709107b977"
integrity sha512-YwSqcLjQcRI0fUFpaSWwU10KIJPFW5Qh+d3cT5DOgx81dypRuUSiPkKFmBY/CDs/R1KdHRadthkcXg2rqAon8Q==
qunit-dom@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-3.4.0.tgz#46246ba42bec4544a7c03a40c686bde1e8bac7b9"
integrity sha512-N5PYbJ20RD3JZN4whINdl7dDfxScUy7eNuO8IwUtBWC7d6SH+BqtBqVZdRn9evxLQVzuask6OGvMy4gdpiCceg==
dependencies:
broccoli-funnel "^3.0.3"
broccoli-merge-trees "^4.2.0"
ember-cli-babel "^7.23.0"
ember-cli-version-checker "^5.1.1"
dom-element-descriptors "^0.5.1"

qunit@^2.17.2:
version "2.19.4"
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.4.tgz#2d689bb1165edd4b812e3ed2ee06ff907e9f2ece"
integrity sha512-aqUzzUeCqlleWYKlpgfdHHw9C6KxkB9H3wNfiBg5yHqQMzy0xw/pbCRHYFkjl8MsP/t8qkTQE+JTYL71azgiew==
qunit@^2.24.1:
version "2.24.1"
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.24.1.tgz#03e39ec00824cc45cabcedf6d2603fedbc7c46af"
integrity sha512-Eu0k/5JDjx0QnqxsE1WavnDNDgL1zgMZKsMw/AoAxnsl9p4RgyLODyo2N7abZY7CEAnvl5YUqFZdkImzbgXzSg==
dependencies:
commander "7.2.0"
node-watch "0.7.3"
Expand Down Expand Up @@ -21704,7 +21706,7 @@ string-template@~0.2.1:
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand All @@ -21730,6 +21732,15 @@ string-width@^1.0.1:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0"

"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.2, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^3.0.0, string-width@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
Expand Down Expand Up @@ -21900,7 +21911,7 @@ stringify-object@^3.2.2:
is-obj "^1.0.1"
is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -21935,6 +21946,13 @@ strip-ansi@^6.0.0:
dependencies:
ansi-regex "^5.0.0"

strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
Expand Down Expand Up @@ -23738,8 +23756,7 @@ workerpool@^6.0.0, workerpool@^6.1.4:
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
name wrap-ansi-cjs
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -23765,6 +23782,15 @@ wrap-ansi@^5.1.0:
string-width "^3.0.0"
strip-ansi "^5.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down

0 comments on commit 519bc79

Please sign in to comment.