mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: emit updated on NativeTheme on the UI thread to avoid DCHECK (#20137)

Browse source 
* fix: emit updated on NativeTheme on the UI thread to avoid DCHECK

* Update atom_api_native_theme.cc

* spec: wait a few ticks for async events to emit so that test events do not leak into each other
This commit is contained in:
Samuel Attard 2019-09-16 16:08:01 -07:00 • committed by GitHub
parent 2b316f3843
commit 0e61709fa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
spec-main/api-native-theme-spec.ts
View file

@ -3,9 +3,10 @@ import { nativeTheme, systemPreferences } from 'electron'
import * as os from 'os'
import * as semver from 'semver'
import { ifdescribe } from './spec-helpers'
import { delay, ifdescribe } from './spec-helpers'
import { emittedOnce } from './events-helpers';
describe('nativeTheme module', () => {
describe.only('nativeTheme module', () => {
describe('nativeTheme.shouldUseDarkColors', () => {
it('returns a boolean', () => {
expect(nativeTheme.shouldUseDarkColors).to.be.a('boolean')
@ -13,8 +14,10 @@ describe('nativeTheme module', () => {
})
describe('nativeTheme.themeSource', () => {
afterEach(() => {
afterEach(async () => {
nativeTheme.themeSource = 'system'
// Wait for any pending events to emit
await delay(20)
})
it('is system by default', () => {
@ -28,23 +31,26 @@ describe('nativeTheme module', () => {
expect(nativeTheme.shouldUseDarkColors).to.equal(false)
})
it('should emit the "updated" event when it is set and the resulting "shouldUseDarkColors" value changes', () => {
it('should emit the "updated" event when it is set and the resulting "shouldUseDarkColors" value changes', async () => {
let updatedEmitted = emittedOnce(nativeTheme, 'updated')
nativeTheme.themeSource = 'dark'
let called = false
nativeTheme.once('updated', () => {
called = true
})
await updatedEmitted
updatedEmitted = emittedOnce(nativeTheme, 'updated')
nativeTheme.themeSource = 'light'
expect(called).to.equal(true)
await updatedEmitted
})
it('should not emit the "updated" event when it is set and the resulting "shouldUseDarkColors" value is the same', () => {
it('should not emit the "updated" event when it is set and the resulting "shouldUseDarkColors" value is the same', async () => {
nativeTheme.themeSource = 'dark'
// Wait a few ticks to allow an async events to flush
await delay(20)
let called = false
nativeTheme.once('updated', () => {
called = true
})
nativeTheme.themeSource = 'dark'
// Wait a few ticks to allow an async events to flush
await delay(20)
expect(called).to.equal(false)
})