From 811025bccbb78d0cf1ee913298b3acc1ed98c566 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Mon, 3 Apr 2023 11:56:05 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Remove=20session=20r?= =?UTF-8?q?ecording=20type=20check=20and=20update=20name=20(#179)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/addon/abilities/channel-recording.js | 2 +- .../api/addon/abilities/session-recording.js | 2 +- .../unit/abilities/channel-recording-test.js | 10 +---- .../unit/abilities/session-recording-test.js | 37 +------------------ 4 files changed, 5 insertions(+), 46 deletions(-) diff --git a/addons/api/addon/abilities/channel-recording.js b/addons/api/addon/abilities/channel-recording.js index fb6676466..54164b881 100644 --- a/addons/api/addon/abilities/channel-recording.js +++ b/addons/api/addon/abilities/channel-recording.js @@ -14,7 +14,7 @@ export default class ChannelRecordingAbility extends ModelAbility { @service abilities; // =permissions - get canDownloadAsciicast() { + get canGetAsciicast() { const sessionRecording = this.model.connection_recording.session_recording; const sessionRecordingAbility = this.abilities.abilityFor( 'session-recording', diff --git a/addons/api/addon/abilities/session-recording.js b/addons/api/addon/abilities/session-recording.js index 1e6360092..13d2fc4bb 100644 --- a/addons/api/addon/abilities/session-recording.js +++ b/addons/api/addon/abilities/session-recording.js @@ -29,6 +29,6 @@ export default class SessionRecordingAbility extends ModelAbility { } get canDownload() { - return this.model.isSSH && this.hasAuthorizedAction('download'); + return this.hasAuthorizedAction('download'); } } diff --git a/addons/api/tests/unit/abilities/channel-recording-test.js b/addons/api/tests/unit/abilities/channel-recording-test.js index dff28858d..335d85d9d 100644 --- a/addons/api/tests/unit/abilities/channel-recording-test.js +++ b/addons/api/tests/unit/abilities/channel-recording-test.js @@ -38,10 +38,7 @@ module('Unit | Ability | channel-recording', function (hooks) { }); assert.true( - canService.can( - 'downloadAsciicast channel-recording', - channelRecordingModel - ) + canService.can('getAsciicast channel-recording', channelRecordingModel) ); }); @@ -64,10 +61,7 @@ module('Unit | Ability | channel-recording', function (hooks) { }); assert.false( - canService.can( - 'downloadAsciicast channel-recording', - channelRecordingModel - ) + canService.can('getAsciicast channel-recording', channelRecordingModel) ); }); }); diff --git a/addons/api/tests/unit/abilities/session-recording-test.js b/addons/api/tests/unit/abilities/session-recording-test.js index 729aebd07..5e258a323 100644 --- a/addons/api/tests/unit/abilities/session-recording-test.js +++ b/addons/api/tests/unit/abilities/session-recording-test.js @@ -1,6 +1,5 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -import { TYPE_SESSION_RECORDING_SSH } from 'api/models/session-recording'; module('Unit | Ability | session-recording', function (hooks) { setupTest(hooks); @@ -18,21 +17,19 @@ module('Unit | Ability | session-recording', function (hooks) { assert.ok(ability); }); - test('can download when an ssh recording has download authorization', function (assert) { + test('can download when a recording has download authorization', function (assert) { assert.expect(2); const recordingWithAuthorizedAction = store.createRecord( 'session-recording', { authorized_actions: ['download'], - type: TYPE_SESSION_RECORDING_SSH, } ); const recordingWithoutAuthorizedAction = store.createRecord( 'session-recording', { authorized_actions: [], - type: TYPE_SESSION_RECORDING_SSH, } ); @@ -49,36 +46,4 @@ module('Unit | Ability | session-recording', function (hooks) { ) ); }); - - test('cannot download when a recording is not ssh type', function (assert) { - assert.expect(2); - - const recordingWithAuthorizedAction = store.createRecord( - 'session-recording', - { - authorized_actions: ['download'], - type: 'unknown', - } - ); - const recordingWithoutAuthorizedAction = store.createRecord( - 'session-recording', - { - authorized_actions: [], - type: 'unknown', - } - ); - - assert.false( - canService.can( - 'download session-recording', - recordingWithAuthorizedAction - ) - ); - assert.false( - canService.can( - 'download session-recording', - recordingWithoutAuthorizedAction - ) - ); - }); });