Skip to content

Commit

Permalink
Merge pull request #581 from Real-Dev-Squad/feature/task-status
Browse files Browse the repository at this point in the history
Removed condition for hiding the status dropdown
  • Loading branch information
skv93-coder authored Mar 22, 2024
2 parents 2e82975 + a9be58f commit 118d2e2
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 3 deletions.
4 changes: 1 addition & 3 deletions app/components/task/holder.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
@closeModel={{this.closeExtensionModel}}
/>
{{/if}}

{{#if (not-eq this.status this.TASK_KEYS.VERIFIED)}}
{{#if (or (not-eq this.status this.TASK_KEYS.VERIFIED) (eq @dev true))}}
<div class='task-update-container'>
<label id='task-update-label' for='task-update'><b>Status:</b></label>
<select
Expand All @@ -43,7 +42,6 @@
</select>
</div>
{{/if}}

<button
class='task-card__extensionForm-button'
data-test-task-extensionForm-button
Expand Down
47 changes: 47 additions & 0 deletions tests/integration/components/tasks/holder-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,53 @@ module('Integration | Component | Tasks Holder', function (hooks) {
.dom('[data-test-task-status-select]')
.hasValue(TASK_KEYS.IN_PROGRESS);
});
test('Verify task status dropdown is hidden when task status is verified', async function (assert) {
const testTask = tasksData[3];
testTask.status = TASK_KEYS.VERIFIED;

this.set('task', testTask);
this.set('mock', () => {});
this.set('onTaskUpdate', (taskId, error) => {
error();
});
this.set('isLoading', false);
this.set('disabled', false);
this.set('defaultType', DEFAULT_TASK_TYPE);

await render(hbs`<Task::Holder
@task={{this.task}}
@onTaskChange={{this.mock}}
@onStausChange={{this.mock}}
@onTaskUpdate={{this.onTaskUpdate}}
@userSelectedTask={{this.defaultType}}
@disabled={{this.disabled}}
/>`);
assert.dom('[data-test-task-status-select]').doesNotExist();
});
test('Verify task status dropdown is visible when task status is verified and feature flag is on', async function (assert) {
const testTask = tasksData[3];
testTask.status = TASK_KEYS.VERIFIED;

this.set('task', testTask);
this.set('mock', () => {});
this.set('onTaskUpdate', (taskId, error) => {
error();
});
this.set('isLoading', false);
this.set('disabled', false);
this.set('defaultType', DEFAULT_TASK_TYPE);
this.set('dev', true);
await render(hbs`<Task::Holder
@task={{this.task}}
@onTaskChange={{this.mock}}
@onStausChange={{this.mock}}
@onTaskUpdate={{this.onTaskUpdate}}
@userSelectedTask={{this.defaultType}}
@disabled={{this.disabled}}
@dev={{this.dev}}
/>`);
assert.dom('[data-test-task-status-select]').hasValue(TASK_KEYS.VERIFIED);
});

test('Verify values of task status upon api failures under feature flag', async function (assert) {
const testTask = tasksData[3];
Expand Down

0 comments on commit 118d2e2

Please sign in to comment.