chore: Fix tests for macos frame

This commit is contained in:
Susmitha Girumala committed 2021-09-15 10:54:28 -04:00
1 parent aecfdbb635
commit 9c423ec05b
4 files changed
+21 -11

No files matched your search

+1 -2
View File
@@ -19,8 +19,7 @@ export default class ApplicationController extends Controller {
* @type {boolean}
*/
@computed('isMacOS', 'isFrameless')
get hasMacOSFrame() {
console.log('hasMacOSFrame ', this.isMacOS && !this.isFrameless);
get isFrameMacOS() {
return this.isMacOS && !this.isFrameless;
}
}
+1 -1
View File
@@ -8,7 +8,7 @@
<layout.header>
<Rose::Header
class='{{if (is-loading) ' loading'}}
{{if this.hasMacOSFrame ' header-cushion'}}'
{{if this.isFrameMacOS ' header-cushion'}}'
as |header|
>
<header.brand @logo='logo-app' @text={{app-name}} />
@@ -48,20 +48,30 @@ module('Acceptance | origin', function (hooks) {
});
test('visiting index on MacOS hides custom window actions', async function (assert) {
assert.expect(3);
assert.expect(4);
stubs.ipcService.withArgs('isMacOS').returns(true);
stubs.ipcService.withArgs('isFrameless').returns(false);
await visit(urls.origin);
assert.notOk(find('.button-window-close'));
assert.notOk(find('.button-window-minimize'));
assert.notOk(find('.button-window-fullscreen'));
assert.notOk(find('.button-window-close'), 'Window close button');
assert.notOk(find('.button-window-minimize'), 'Window minimize button');
assert.notOk(find('.button-window-fullscreen'), 'Window fullscreen button');
assert.ok(
find('.rose-header.header-cushion'),
'Adds header padding around native window actions'
);
});
test('visiting index on non-MacOS shows custom window actions', async function (assert) {
assert.expect(3);
assert.expect(4);
stubs.ipcService.withArgs('isMacOS').returns(false);
stubs.ipcService.withArgs('isFrameless').returns(true);
await visit(urls.origin);
assert.ok(find('.button-window-close'));
assert.ok(find('.button-window-minimize'));
assert.ok(find('.button-window-fullscreen'));
assert.ok(find('.button-window-close'), 'Window close button');
assert.ok(find('.button-window-minimize'), 'Window minimize button');
assert.ok(find('.button-window-fullscreen'), 'Window fullscreen button');
assert.notOk(
find('.rose-header.header-cushion'),
'Disables header padding around native window actions'
);
});
});
@@ -18,6 +18,7 @@ class MockIPC {
resetOrigin() {}
isMacOS() {}
isFrameless() {}
}
/**