From ff447981a15680740d1a15023783dbaea2cfb251 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Fri, 8 Jan 2021 13:22:13 -0500 Subject: [PATCH] fix: desktop: revert header padding & fix broken tests --- addons/core/tests/unit/authenticators/password-test.js | 1 + ui/admin/tests/acceptance/authentication-test.js | 1 + ui/desktop/app/styles/app.scss | 3 +++ ui/desktop/tests/unit/authenticators/password-test.js | 1 + 4 files changed, 6 insertions(+) diff --git a/addons/core/tests/unit/authenticators/password-test.js b/addons/core/tests/unit/authenticators/password-test.js index 35e872b48..a7580ef7d 100644 --- a/addons/core/tests/unit/authenticators/password-test.js +++ b/addons/core/tests/unit/authenticators/password-test.js @@ -44,6 +44,7 @@ module('Unit | Authenticator | password', function (hooks) { const authMethod = { id: 'paum_1234' }; this.server.create('scope', { id: 'global', type: 'global' }); this.server.create('auth-method', { id: authMethod.id, scopeId: 'global' }); + this.server.create('user', { scopeId: 'global' }); await authenticator.authenticate(creds, null, { scope, authMethod }); assert.equal( applicationAdapter.headers.Authorization, diff --git a/ui/admin/tests/acceptance/authentication-test.js b/ui/admin/tests/acceptance/authentication-test.js index f39c4d9bd..872d99d83 100644 --- a/ui/admin/tests/acceptance/authentication-test.js +++ b/ui/admin/tests/acceptance/authentication-test.js @@ -67,6 +67,7 @@ module('Acceptance | authentication', function (hooks) { globalAuthMethod = this.server.create('auth-method', { scope: globalScope, }); + this.server.create('user', { scope: globalScope }); authMethod = this.server.create('auth-method', { scope: orgScope }); orgScopeID = orgScope.id; globalAuthMethodID = globalAuthMethod.id; diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index be7722d0b..14d7233c2 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -100,6 +100,9 @@ } .rose-header { + -webkit-app-region: drag; + min-height: sizing.rems(l) * 2; + padding-left: sizing.rems(l) * 3; position: relative; .logotype { diff --git a/ui/desktop/tests/unit/authenticators/password-test.js b/ui/desktop/tests/unit/authenticators/password-test.js index 35e872b48..a7580ef7d 100644 --- a/ui/desktop/tests/unit/authenticators/password-test.js +++ b/ui/desktop/tests/unit/authenticators/password-test.js @@ -44,6 +44,7 @@ module('Unit | Authenticator | password', function (hooks) { const authMethod = { id: 'paum_1234' }; this.server.create('scope', { id: 'global', type: 'global' }); this.server.create('auth-method', { id: authMethod.id, scopeId: 'global' }); + this.server.create('user', { scopeId: 'global' }); await authenticator.authenticate(creds, null, { scope, authMethod }); assert.equal( applicationAdapter.headers.Authorization,