Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small set of stage to lesson updates #40934

Merged
merged 6 commits into from
Jun 3, 2021
Merged

Small set of stage to lesson updates #40934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf0a836
update a couple more palces in progressTestHelpers
dmcavoy Jun 3, 2021
332fe52
Merge branch 'random-stage-to-lesson-4' into random-stage-to-lesson-5
dmcavoy Jun 3, 2021
8e11854
Update a couple places of Stage to Lesson
dmcavoy Jun 3, 2021
689b318
Merge branch 'random-stage-to-lesson-4' into random-stage-to-lesson-5
dmcavoy Jun 3, 2021
a249c56
Merge branch 'random-stage-to-lesson-4' into random-stage-to-lesson-5
dmcavoy Jun 3, 2021
3297945
Merge branch 'random-stage-to-lesson-4' into random-stage-to-lesson-5
dmcavoy Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/src/templates/progress/progressTestHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,17 @@ export const fakeStudentLastUpdateByScript = (scriptData, students) => {
};

export const fakeProgressTableReduxInitialState = (
stages,
lessons,
scriptData,
students = fakeStudents(2)
) => {
if (!stages) {
if (!lessons) {
const lesson1 = fakeLessonWithLevels({position: 1, levels: fakeLevels(1)});
const lesson2 = fakeLessonWithLevels({position: 2, levels: fakeLevels(2)});
stages = [lesson1, lesson2];
lessons = [lesson1, lesson2];
}
if (!scriptData) {
scriptData = fakeScriptData({stages});
scriptData = fakeScriptData({stages: lessons});
}
const levelProgressData = fakeStudentLevelProgress(
scriptData.stages[0].levels,
Expand All @@ -233,7 +233,7 @@ export const fakeProgressTableReduxInitialState = (
return {
progress: {
lessonGroups: [],
lessons: stages,
lessons: lessons,
focusAreaLessonIds: [],
professionalLearningCourse: false
},
Expand Down
18 changes: 9 additions & 9 deletions apps/test/unit/templates/progress/progressHelpersTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('progressHelpers', () => {
);
});

it('returns true for a lockable stage as teacher', () => {
it('returns true for a lockable lesson as teacher', () => {
const localState = {
...state,
lessonLock: {
Expand Down Expand Up @@ -157,8 +157,8 @@ describe('progressHelpers', () => {
});

describe('lessonIsLockedForAllStudents', () => {
const unlockedStageId = 1000;
const lockedStageId = 1111;
const unlockedLessonId = 1000;
const lockedLessonId = 1111;

const stateForSelectedSection = sectionId => ({
teacherSections: {
Expand All @@ -167,7 +167,7 @@ describe('progressHelpers', () => {
lessonLock: {
lessonsBySectionId: {
11: {
[lockedStageId]: [
[lockedLessonId]: [
{
locked: true,
name: 'student1'
Expand All @@ -177,7 +177,7 @@ describe('progressHelpers', () => {
name: 'student2'
}
],
[unlockedStageId]: [
[unlockedLessonId]: [
{
locked: true,
name: 'student1'
Expand All @@ -195,27 +195,27 @@ describe('progressHelpers', () => {
it('returns false when we have no selected section', () => {
const state = stateForSelectedSection(null);
assert.strictEqual(
lessonIsLockedForAllStudents(lockedStageId, state),
lessonIsLockedForAllStudents(lockedLessonId, state),
false
);
assert.strictEqual(
lessonIsLockedForAllStudents(unlockedStageId, state),
lessonIsLockedForAllStudents(unlockedLessonId, state),
false
);
});

it('returns false when the selected section has an unlocked student', () => {
const state = stateForSelectedSection(11);
assert.strictEqual(
lessonIsLockedForAllStudents(unlockedStageId, state),
lessonIsLockedForAllStudents(unlockedLessonId, state),
false
);
});

it('returns true when the selected section has no unlocked students', () => {
const state = stateForSelectedSection(11);
assert.strictEqual(
lessonIsLockedForAllStudents(lockedStageId, state),
lessonIsLockedForAllStudents(lockedLessonId, state),
true
);
});
Expand Down