Fix require statement in extensionsReducer- rimraf needs to be global…

…ly required, not pathed Also includes: - move extensionsReducerTest to the browser folder - fix broken unit tests - svg needed stub on windows - export HTML had an issue on windows Auditors: @cezaraugusto
brave · Apr 10, 2017 · 61ae1a7 · 61ae1a7
1 parent b06c959
commit 61ae1a7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/app/browser/reducers/extensionsReducer.js b/app/browser/reducers/extensionsReducer.js
@@ -8,7 +8,7 @@ const electron = require('electron')
 const app = electron.app
 
 const path = require('path')
-const rimraf = require('../../../tools/lib/rimraf')
+const rimraf = require('rimraf')
 
 const extensionState = require('../../common/state/extensionState')
 const ExtensionConstants = require('../../common/constants/extensionConstants')

diff --git a/test/unit/about/preferencesTest.js b/test/unit/about/preferencesTest.js
@@ -27,6 +27,7 @@ describe('Preferences component', function () {
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_general.svg', 'browser_prefs_general.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_search.svg', 'browser_prefs_search.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_tabs.svg', 'browser_prefs_tabs.svg')
+    mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_extensions.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_plugins.svg', 'browser_prefs_plugins.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_security.svg', 'browser_prefs_security.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_shields.svg', 'browser_prefs_shields.svg')

diff --git a/test/unit/app/browser/exportBookmarksTest.js b/test/unit/app/browser/exportBookmarksTest.js
@@ -110,8 +110,11 @@ describe('Bookmarks export', function () {
   it('generated html', function () {
     const personal = exporter.createBookmarkArray(sites)
     const other = exporter.createBookmarkArray(sites, -1, false)
-    const result = exporter.createBookmarkHTML(personal, other)
-    const expected = fs.readFileSync('./test/fixtures/bookmarkExport.html', 'utf8')
+    let result = exporter.createBookmarkHTML(personal, other)
+    let expected = fs.readFileSync('./test/fixtures/bookmarkExport.html', 'utf8')
+
+    result = result.replace(/\s+/g,' ')
+    expected = expected.replace(/\s+/g,' ')
 
     assert.equal(result, expected)
   })

diff --git a/...enderer/reducers/extensionsReducerTest.js → ...browser/reducers/extensionsReducerTest.js b/...enderer/reducers/extensionsReducerTest.js → ...browser/reducers/extensionsReducerTest.js
@@ -39,7 +39,7 @@ describe('extensionsReducer', function () {
       useCleanCache: true
     })
     mockery.registerMock('electron', fakeElectron)
-    mockery.registerMock('../../../tools/lib/rimraf', fakeRimraf)
+    mockery.registerMock('rimraf', fakeRimraf)
     extensionsReducer = require('../../../../../app/browser/reducers/extensionsReducer')
   })
 

diff --git a/test/unit/app/renderer/paymentsTabTest.js b/test/unit/app/renderer/paymentsTabTest.js
@@ -29,6 +29,7 @@ describe('PaymentsTab component', function () {
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_general.svg', 'browser_prefs_general.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_search.svg', 'browser_prefs_search.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_tabs.svg', 'browser_prefs_tabs.svg')
+    mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_extensions.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_plugins.svg', 'browser_prefs_plugins.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_security.svg', 'browser_prefs_security.svg')
     mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_shields.svg', 'browser_prefs_shields.svg')