Merge remote-tracking branch 'origin/develop' into navigation-update

* origin/develop: (49 commits)
  Fix react & extra buttons not styled on tab-focus
  Fix popover not popping up
  Fix styling on Safari
  Use :focus-visible instead of :focus for focus markers
  Optimize Reply badge position
  Add badges to status interacting buttons
  Update dependency nightwatch to v2
  Update dependency eslint-plugin-n to v15.2.5
  Update dependency mocha to v10
  Update dependency karma-coverage to v2
  Update dependency sass to v1.54.5
  Update dependency karma-firefox-launcher to v2
  Update dependency vue-template-compiler to v2.7.9
  Pin dependencies
  Refresh yarn.lock
  Allow column width configuration: allow stretching navbar with columns
  Remove legacy code for chunksSortMode
  Add FIXME comment about html-webpack-plugin-after-emit
  Use exact webpack version in package.json
  Reintroduce css minimizer
  ...

2 files changed, 9 insertions, 9 deletions

diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index 8959e009..f3d0849b 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -16,7 +16,7 @@ const webpackConfig = merge(baseConfig, {
   module: {
     rules: utils.styleLoaders()
   },
-  devtool: '#inline-source-map',
+  devtool: 'inline-source-map',
   // vue: {
   //   loaders: {
   //     js: 'isparta'
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index 525e57a5..98bb05a8 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -195,7 +195,7 @@ describe('API Entities normalizer', () => {
         expect(parsedPost).to.have.property('type', 'status')
         expect(parsedRepeat).to.have.property('type', 'retweet')
         expect(parsedRepeat).to.have.property('retweeted_status')
-        expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
+        expect(parsedRepeat).to.have.nested.property('retweeted_status.id', 'deadbeef')
       })
 
       it('sets nsfw for statuses with the #nsfw tag', () => {
@@ -229,7 +229,7 @@ describe('API Entities normalizer', () => {
         expect(parsedPost).to.have.property('type', 'status')
         expect(parsedRepeat).to.have.property('type', 'retweet')
         expect(parsedRepeat).to.have.property('retweeted_status')
-        expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
+        expect(parsedRepeat).to.have.nested.property('retweeted_status.id', 'deadbeef')
       })
     })
   })
@@ -284,9 +284,9 @@ describe('API Entities normalizer', () => {
       })
       expect(parseNotification(notif)).to.have.property('id', 123)
       expect(parseNotification(notif)).to.have.property('seen', false)
-      expect(parseNotification(notif)).to.have.deep.property('status.id', '444')
-      expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
-      expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
+      expect(parseNotification(notif)).to.have.nested.property('status.id', '444')
+      expect(parseNotification(notif)).to.have.nested.property('action.id', '444')
+      expect(parseNotification(notif)).to.have.nested.property('from_profile.id', 'spurdo')
     })
 
     it('correctly normalizes favorite notifications', () => {
@@ -303,9 +303,9 @@ describe('API Entities normalizer', () => {
       expect(parseNotification(notif)).to.have.property('id', 123)
       expect(parseNotification(notif)).to.have.property('type', 'like')
       expect(parseNotification(notif)).to.have.property('seen', true)
-      expect(parseNotification(notif)).to.have.deep.property('status.id', '4412')
-      expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
-      expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
+      expect(parseNotification(notif)).to.have.nested.property('status.id', '4412')
+      expect(parseNotification(notif)).to.have.nested.property('action.id', '444')
+      expect(parseNotification(notif)).to.have.nested.property('from_profile.id', 'spurdo')
     })
   })