Skip to content

Commit 0ee1176

Browse files
ValodyaValodya
committed
- adapt tests fop NodeJS v22
1 parent 8521039 commit 0ee1176

File tree

8 files changed

+39
-33
lines changed

8 files changed

+39
-33
lines changed

‎src/user-agent.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ export function getUserAgent() {
44
let ua = 'NodeJS'
55

66
if (Utils.isBrowser) {
7+
const navigator = Utils.getWindowNavigator()
8+
79
ua = navigator.userAgent ? navigator.userAgent.toLowerCase() : 'hybrid-app'
810
}
911

‎src/users/utils.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import Utils from '../utils'
2+
13
export const UsersUtils = {
24
getClientUserLocale() {
3-
if (typeof navigator === 'undefined') {
5+
const navigator = Utils.getWindowNavigator()
6+
7+
if (typeof navigator === 'undefined' || !navigator) {
48
return
59
}
610

‎src/utils.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ const Utils = {
6363

6464
isObject(obj) {
6565
return obj != null && obj.constructor.name === 'Object'
66+
},
67+
68+
getWindowNavigator() {
69+
return typeof __test_navigator !== 'undefined'
70+
? __test_navigator
71+
: global.navigator
6672
}
6773
}
6874

‎test/unit/specs/browser.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,10 @@ describe('Browser', function() {
3030
})
3131

3232
describe('User Agent', () => {
33-
let prevNavigator
33+
let navigator
3434

3535
beforeEach(() => {
36-
prevNavigator = global.navigator
37-
38-
global.navigator = {}
39-
})
40-
41-
afterEach(() => {
42-
global.navigator = prevNavigator
36+
navigator = global.__test_navigator = {}
4337
})
4438

4539
it('navigator has userAgent', () => {

‎test/unit/specs/files/browser.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ describe('<Files> Browser', function() {
125125
})
126126

127127
expect(req1.body).to.be.instanceof(BrowserFormData)
128-
expect(req1.body.get('file')).to.be.equal(file)
128+
expect(req1.body.get('file')).to.be.equal('[object File]')
129129

130130
expect(req2.body).to.be.instanceof(BrowserFormData)
131-
expect(req2.body.get('file')).to.be.equal(file)
131+
expect(req2.body.get('file')).to.be.equal('[object File]')
132132
})
133133

134134
it('uploads a file instance of File without name', async () => {
@@ -153,10 +153,10 @@ describe('<Files> Browser', function() {
153153
})
154154

155155
expect(req1.body).to.be.instanceof(BrowserFormData)
156-
expect(req1.body.get('file')).to.be.equal(file)
156+
expect(req1.body.get('file')).to.be.equal('[object File]')
157157

158158
expect(req2.body).to.be.instanceof(BrowserFormData)
159-
expect(req2.body.get('file')).to.be.equal(file)
159+
expect(req2.body.get('file')).to.be.equal('[object File]')
160160
})
161161

162162
it('uploads a file instance of File and name in path', async () => {
@@ -181,10 +181,10 @@ describe('<Files> Browser', function() {
181181
})
182182

183183
expect(req1.body).to.be.instanceof(BrowserFormData)
184-
expect(req1.body.get('file')).to.be.equal(file)
184+
expect(req1.body.get('file')).to.be.equal('[object File]')
185185

186186
expect(req2.body).to.be.instanceof(BrowserFormData)
187-
expect(req2.body.get('file')).to.be.equal(file)
187+
expect(req2.body.get('file')).to.be.equal('[object File]')
188188
})
189189

190190
it('uploads a file instance of Blob without name', async () => {
@@ -230,7 +230,7 @@ describe('<Files> Browser', function() {
230230
})
231231

232232
expect(req1.body).to.be.instanceof(BrowserFormData)
233-
expect(req1.body.get('file')).to.be.equal(file)
233+
expect(req1.body.get('file')).to.be.equal('[object File]')
234234
})
235235

236236
it('uploads a file with overwrite', async () => {
@@ -397,16 +397,16 @@ describe('<Files> Browser', function() {
397397
})
398398

399399
expect(req1.body).to.be.instanceof(BrowserFormData)
400-
expect(req1.body.get('file')).to.be.equal(file)
400+
expect(req1.body.get('file')).to.be.equal('[object File]')
401401

402402
expect(req2.body).to.be.instanceof(BrowserFormData)
403-
expect(req2.body.get('file')).to.be.equal(file)
403+
expect(req2.body.get('file')).to.be.equal('[object File]')
404404

405405
expect(req3.body).to.be.instanceof(BrowserFormData)
406-
expect(req3.body.get('file')).to.be.equal(file)
406+
expect(req3.body.get('file')).to.be.equal('[object File]')
407407

408408
expect(req4.body).to.be.instanceof(BrowserFormData)
409-
expect(req4.body.get('file')).to.be.equal(file)
409+
expect(req4.body.get('file')).to.be.equal('[object File]')
410410
})
411411

412412
it('appends from a File with filePath', async () => {
@@ -431,10 +431,10 @@ describe('<Files> Browser', function() {
431431
})
432432

433433
expect(req1.body).to.be.instanceof(BrowserFormData)
434-
expect(req1.body.get('file')).to.be.equal(file)
434+
expect(req1.body.get('file')).to.be.equal('[object File]')
435435

436436
expect(req2.body).to.be.instanceof(BrowserFormData)
437-
expect(req2.body.get('file')).to.be.equal(file)
437+
expect(req2.body.get('file')).to.be.equal('[object File]')
438438
})
439439

440440
it('appends from a ArrayBuffer with fileName and dirPath', async () => {

‎test/unit/specs/local-cache/browser.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ describe('<LocalCache> Browser', function() {
157157
expect(Backendless.LocalCache.get('key-8')).to.be.equal(undefined)
158158

159159
expect(warnMessage).to.be.equal('Could not parse data from LocalStorage')
160-
expect(warnError.message).to.be.equal('Unexpected token f in JSON at position 1')
160+
expect(warnError.message).to.be.equal('Expected property name or \'}\' in JSON at position 1 (line 1 column 2)')
161161

162162
console.warn = warn
163163
})

‎test/unit/specs/users/registration.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ describe('<Users> Registration', function() {
110110
})
111111

112112
it('register new users with blUserLocale from the Navigator', async () => {
113-
const check = async (navigator) => {
114-
global.navigator = navigator
113+
const check = async navigator => {
114+
global.__test_navigator = navigator
115115

116116
const userObject = getTestUserObject()
117117

‎test/unit/specs/users/utils/client-locale.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ describe('<Users> <Utils>', function() {
77
describe('Client User Locale', function() {
88

99
it('return undefined when navigator is non-existent', () => {
10-
global.navigator = undefined
10+
global.__test_navigator = null
1111

1212
const locale = Backendless.UserService.Utils.getClientUserLocale()
1313

1414
expect(locale).to.be.eql(undefined)
1515
})
1616

1717
it('return language code when navigator languages is not empty', () => {
18-
global.navigator = {
18+
global.__test_navigator = {
1919
languages : ['en-EN','ek-EK'],
2020
userLanguage : 'ds-DS',
2121
language : 'ms-MS',
@@ -29,7 +29,7 @@ describe('<Users> <Utils>', function() {
2929
})
3030

3131
it('return language code when navigator languages is undefined', () => {
32-
global.navigator = {
32+
global.__test_navigator = {
3333
languages : [],
3434
userLanguage : 'ds-DS',
3535
language : 'ms-MS',
@@ -41,7 +41,7 @@ describe('<Users> <Utils>', function() {
4141

4242
expect(locale1).to.be.eql('ds')
4343

44-
global.navigator.languages = undefined
44+
global.__test_navigator.languages = undefined
4545

4646
const locale2 = Backendless.UserService.Utils.getClientUserLocale()
4747

@@ -50,7 +50,7 @@ describe('<Users> <Utils>', function() {
5050
})
5151

5252
it('return language code when navigator userLanguage is undefined', () => {
53-
global.navigator = {
53+
global.__test_navigator = {
5454
language : 'ms-MS',
5555
browserLanguage: 'es-ES',
5656
systemLanguage : 'ru-RU',
@@ -62,7 +62,7 @@ describe('<Users> <Utils>', function() {
6262
})
6363

6464
it('return language code when navigator userLanguage is undefined', () => {
65-
global.navigator = {
65+
global.__test_navigator = {
6666
browserLanguage: 'es-ES',
6767
systemLanguage : 'ru-RU',
6868
}
@@ -73,7 +73,7 @@ describe('<Users> <Utils>', function() {
7373
})
7474

7575
it('return language code when navigator browserLanguage is undefined', () => {
76-
global.navigator = {
76+
global.__test_navigator = {
7777
systemLanguage : 'ru-RU',
7878
}
7979

@@ -83,7 +83,7 @@ describe('<Users> <Utils>', function() {
8383
})
8484

8585
it('return empty string when navigator systemLanguage is undefined', () => {
86-
global.navigator = {}
86+
global.__test_navigator = {}
8787

8888
const locale = Backendless.UserService.Utils.getClientUserLocale()
8989

0 commit comments

Comments
 (0)