Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/frontend/tests/acceptance/reports/subjects-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -608,29 +608,33 @@ module('Acceptance | Reports - Subject Reports', function (hooks) {
return { id, firstName, middleName, lastName, displayName };
});
counter++;
let rhett;
switch (counter) {
case 1:
assert.strictEqual(
query,
'query { courses(schools: [1], academicYears: [2015]) { id, school { title } } }',
);
return {
rhett = {
data: {
courses: [{ id: 1 }, { id: 31 }],
},
};
break;
case 2:
assert.ok(query.includes('query { courses(ids: [1,31])'));
return {
rhett = {
data: {
courses: [
{ sessions: [{ offerings: [{ instructors: users, instructorGroups: [] }] }] },
],
},
};
break;
default:
assert.ok(false, 'too many queries');
}
return rhett;
});
await page.subjects.list.table.reports[0].select();
assert.strictEqual(currentURL(), '/reports/subjects/3');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module('Integration | Component | learner-group/new-multiple', function (hooks)
await render(
<template><NewMultiple @cancel={{(noop)}} @generateNewLearnerGroups={{(noop)}} /></template>,
);
assert.strictEqual(component.numb);
assert.ok(component.isVisible);
await a11yAudit(this.element);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,20 +236,22 @@ module('Integration | Component | reports/subject/instructor', function (hooks)
const { query } = JSON.parse(requestBody);
counter++;
const { users } = responseData.data;
let rhett = null;
switch (counter) {
case 1:
assert.strictEqual(
query,
'query { courses(academicYears: [2005]) { id, school { title } } }',
);
return {
rhett = {
data: {
courses: [{ id: 1 }, { id: 31 }],
},
};
break;
case 2:
assert.ok(query.includes('query { courses(ids: [1,31])'));
return {
rhett = {
data: {
courses: [
{ sessions: [{ offerings: [{ instructors: [users[1]], instructorGroups: [] }] }] },
Expand All @@ -265,9 +267,11 @@ module('Integration | Component | reports/subject/instructor', function (hooks)
],
},
};
break;
default:
assert.ok(false, 'too many queries');
}
return rhett;
});
const { id } = this.server.create('report', {
subject: 'instructor',
Expand Down Expand Up @@ -326,14 +330,15 @@ module('Integration | Component | reports/subject/instructor', function (hooks)
const { query } = JSON.parse(requestBody);
counter++;
const { users } = responseData.data;
let rhett;
switch (counter) {
case 1:
assert.strictEqual(
query,
'query { courses(learningMaterials: [1]) { id, school { title } } }',
'correct first query is run',
);
return {
rhett = {
data: {
courses: [
{
Expand All @@ -342,9 +347,10 @@ module('Integration | Component | reports/subject/instructor', function (hooks)
],
},
};
break;
case 2:
assert.ok(query.includes('query { courses(ids: [1])'), 'correct second query is run');
return {
rhett = {
data: {
courses: [
{ sessions: [{ offerings: [{ instructors: [users[1]], instructorGroups: [] }] }] },
Expand All @@ -360,9 +366,11 @@ module('Integration | Component | reports/subject/instructor', function (hooks)
],
},
};
break;
default:
assert.ok(false, 'too many queries');
}
return rhett;
});
const { id } = this.server.create('report', {
subject: 'instructor',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ module('Integration | Component | school vocabulary term manager', function (hoo
assert.strictEqual(this.server.db.terms[0].title, 'new title');
});

test('change term title', async function (assert) {
test('cancel erm title changes', async function (assert) {
assert.expect(2);

const vocabulary = this.server.create('vocabulary');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ module('Integration | Component | new learningmaterial', function (hooks) {
</template>,
);
assert.notOk(component.copyrightPermission.errorMessage.isPresent);
assert.equal(component.copyrightPermission.ariaInvalid, 'false');
assert.strictEqual(component.copyrightPermission.ariaInvalid, 'false');
assert.notOk(component.copyrightRationale.errorMessage.isPresent);
assert.equal(component.copyrightRationale.ariaInvalid, 'false');
assert.strictEqual(component.copyrightRationale.ariaInvalid, 'false');

await component.save();
assert.strictEqual(
Expand All @@ -125,16 +125,16 @@ module('Integration | Component | new learningmaterial', function (hooks) {
component.copyrightPermission.errorMessage.text,
'Agreement or alternate rationale is required for upload',
);
assert.equal(component.copyrightPermission.ariaInvalid, 'true');
assert.strictEqual(component.copyrightPermission.ariaInvalid, 'true');
assert.strictEqual(
component.copyrightRationale.errorMessage.text,
'Copyright Rationale can not be blank',
);
assert.equal(component.copyrightRationale.ariaInvalid, 'true');
assert.strictEqual(component.copyrightRationale.ariaInvalid, 'true');

await component.copyrightPermission.toggle();
assert.notOk(component.copyrightPermission.errorMessage.isPresent);
assert.equal(component.copyrightPermission.ariaInvalid, 'false');
assert.strictEqual(component.copyrightPermission.ariaInvalid, 'false');
assert.notOk(component.copyrightRationale.isVisible);
});

Expand All @@ -153,7 +153,7 @@ module('Integration | Component | new learningmaterial', function (hooks) {
);
assert.notOk(component.copyrightPermission.errorMessage.isPresent);
assert.notOk(component.copyrightRationale.errorMessage.isPresent);
assert.equal(component.copyrightRationale.ariaInvalid, 'false');
assert.strictEqual(component.copyrightRationale.ariaInvalid, 'false');

await component.save();
assert.strictEqual(
Expand All @@ -169,12 +169,12 @@ module('Integration | Component | new learningmaterial', function (hooks) {
component.copyrightRationale.errorMessage.text,
'Copyright Rationale can not be blank',
);
assert.equal(component.copyrightRationale.ariaInvalid, 'true');
assert.strictEqual(component.copyrightRationale.ariaInvalid, 'true');

await component.copyrightRationale.set('my rationale');
assert.notOk(component.copyrightPermission.errorMessage.isPresent);
assert.notOk(component.copyrightRationale.errorMessage.isPresent);
assert.equal(component.copyrightRationale.ariaInvalid, 'false');
assert.strictEqual(component.copyrightRationale.ariaInvalid, 'false');
});

test('validate original author', async function (assert) {
Expand Down