Fix stage URLs in acceptance tests and update progress text in leaderboard test.

Author: rohitpaulk

tests/acceptance/course-admin/view-feedback-test.js

@@ -41,7 +41,7 @@ module('Acceptance | course-admin | view-feedback', function (hooks) {
     });
 
     this.server.create('course-stage-feedback-submission', {
-      courseStage: this.server.schema.courseStages.findBy({ courseId: course.id, slug: 'init' }),
+      courseStage: this.server.schema.courseStages.findBy({ courseId: course.id, position: 1 }),
       language,
       repository,
       user,
@@ -51,7 +51,7 @@ module('Acceptance | course-admin | view-feedback', function (hooks) {
     });
 
     this.server.create('course-stage-feedback-submission', {
-      courseStage: this.server.schema.courseStages.findBy({ courseId: course.id, slug: 'init' }),
+      courseStage: this.server.schema.courseStages.findBy({ courseId: course.id, position: 1 }),
       language,
       repository: other_repository,
       user: other_user,
@@ -81,7 +81,7 @@ module('Acceptance | course-admin | view-feedback', function (hooks) {
     });
 
     this.server.create('course-stage-feedback-submission', {
-      courseStage: this.server.schema.courseStages.findBy({ courseId: course.id, slug: 'init' }),
+      courseStage: this.server.schema.courseStages.findBy({ courseId: course.id, position: 1 }),
       language,
       repository,
       user,

tests/acceptance/course-page/extensions/disable-extensions-test.js

@@ -33,7 +33,7 @@ module('Acceptance | course-page | extensions | disable-extensions', function (h
     assert.strictEqual(coursePage.sidebar.stepListItems.length, 8, 'step list has 8 items');
 
     await coursePage.sidebar.clickOnStepListItem('Start with ext1');
-    assert.strictEqual(currentURL(), '/courses/dummy/stages/ext1:1', 'current URL is /stages/ext1:1');
+    assert.strictEqual(currentURL(), '/courses/dummy/stages/qh7', 'current URL is /stages/qh7');
 
     await coursePage.sidebar.configureExtensionsToggles[0].click();
 

tests/acceptance/course-page/extensions/enable-extensions-after-completion-test.js

@@ -102,7 +102,7 @@ module('Acceptance | course-page | extensions | enable-extensions-after-completi
     await catalogPage.visit();
     await catalogPage.clickOnCourse('Build your own Dummy');
 
-    assert.strictEqual(currentURL(), '/courses/dummy/stages/ext1:1', 'current URL is first extension stage URL');
+    assert.strictEqual(currentURL(), '/courses/dummy/stages/qh7', 'current URL is first extension stage URL');
 
     // Disable Extension 2
     await coursePage.sidebar.configureExtensionsToggles[0].click();
@@ -132,6 +132,6 @@ module('Acceptance | course-page | extensions | enable-extensions-after-completi
     await coursePage.configureExtensionsModal.toggleExtension('Extension 2');
     await coursePage.configureExtensionsModal.clickOnCloseButton();
 
-    assert.strictEqual(currentURL(), '/courses/dummy/stages/ext2:1', 'current URL is next extension stage');
+    assert.strictEqual(currentURL(), '/courses/dummy/stages/ae0', 'current URL is next extension stage');
   });
 });

tests/acceptance/course-page/extensions/view-extension-stages-test.js

@@ -20,10 +20,11 @@ module('Acceptance | course-page | extensions | view-extension-stages', function
     await catalogPage.clickOnCourse('Build your own Redis');
     await courseOverviewPage.clickOnStartCourse();
 
-    assert.strictEqual(coursePage.sidebar.stepListItems.length, 33, 'step list has 33 items');
+    // Stages count (44) + 2 (introduction and repository setup)
+    assert.strictEqual(coursePage.sidebar.stepListItems.length, 46, 'step list has 46 items');
 
     await coursePage.sidebar.clickOnStepListItem('RDB file config');
-    assert.strictEqual(currentURL(), '/courses/redis/stages/persistence-rdb:1', 'current URL is stage page URL');
+    assert.strictEqual(currentURL(), '/courses/redis/stages/zg5', 'current URL is stage page URL');
   });
 
   test('can view extension stages after creating repository', async function (assert) {
@@ -43,6 +44,6 @@ module('Acceptance | course-page | extensions | view-extension-stages', function
 
     // View a stage from extension 2
     await coursePage.sidebar.clickOnStepListItem('Start with ext2');
-    assert.strictEqual(currentURL(), '/courses/dummy/stages/ext2:1?repo=1', 'current URL is stage page URL');
+    assert.strictEqual(currentURL(), '/courses/dummy/stages/ae0?repo=1', 'current URL is stage page URL');
   });
 });

tests/acceptance/course-page/view-leaderboard-test.js

@@ -32,7 +32,7 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
     assert.strictEqual(coursePage.leaderboard.entries.length, 1, '1 leaderboard entry should be present once course has started');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, currentUser.username, 'leaderboard entry should correspond to current user');
     assert.ok(coursePage.leaderboard.entries[0].statusIsIdle, 'leaderboard entry should be idle until user pushes submission');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '0 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '0 / 44', 'progress text must be shown');
 
     let repository = this.server.schema.repositories.find(1);
     repository.update({ lastSubmission: this.server.create('submission', { repository, status: 'evaluating' }) });
@@ -46,15 +46,15 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
     await settled();
 
     assert.ok(coursePage.leaderboard.entries[0].statusIsIdle, 'leaderboard entry should be idle once submission is done evaluating');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '0 / 31', 'progress text must still be 0 if first stage is not completed');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '0 / 44', 'progress text must still be 0 if first stage is not completed');
 
     repository.update({ lastSubmission: this.server.create('submission', { repository, status: 'evaluating' }) });
 
     await Promise.all(window.pollerInstances.map((poller) => poller.forcePoll()));
     await settled();
 
     assert.ok(coursePage.leaderboard.entries[0].statusIsActive, 'leaderboard entry should be active if new submission is present evaluating');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '0 / 31', 'progress text must still be 0 if first stage is not completed');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '0 / 44', 'progress text must still be 0 if first stage is not completed');
 
     this.server.schema.submissions.find(2).update({ status: 'success' });
 
@@ -67,7 +67,7 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
     await settled();
 
     assert.ok(coursePage.leaderboard.entries[0].statusIsIdle, 'leaderboard entry should be idle after completing a stage');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 31', 'progress text must still be 0 if first stage is not completed');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 44', 'progress text must still be 0 if first stage is not completed');
   });
 
   test('can view leaderboard on overview page when other recent players are present', async function (assert) {
@@ -99,15 +99,15 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
 
     assert.strictEqual(coursePage.leaderboard.entries.length, 1, 'other entry should be shown');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, otherUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 44', 'progress text must be shown');
 
     await coursePage.createRepositoryCard.clickOnLanguageButton('Python');
 
     assert.strictEqual(coursePage.leaderboard.entries.length, 2, '2 leaderboard entries should be present once course has started');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, otherUser.username, 'leaderboard entry should be sorted by last attempt');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 44', 'progress text must be shown');
     assert.strictEqual(coursePage.leaderboard.entries[1].username, currentUser.username, 'leaderboard entries should be sorted by last attempt');
-    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '0 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '0 / 44', 'progress text must be shown');
 
     let repository = currentUser.reload().repositories.models[0];
     repository.update({
@@ -140,9 +140,9 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
 
     assert.strictEqual(coursePage.leaderboard.entries.length, 2, '2 leaderboard entries should be present once other user has been passed');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, currentUser.username, 'leaderboard entry should be sorted by last attempt');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 44', 'progress text must be shown');
     assert.strictEqual(coursePage.leaderboard.entries[1].username, otherUser.username, 'leaderboard entries should be sorted by last attempt');
-    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 44', 'progress text must be shown');
   });
 
   test('can view leaderboard when current user has leaderboard entry', async function (assert) {
@@ -180,18 +180,18 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
 
     assert.strictEqual(coursePage.leaderboard.entries.length, 2, 'one entry for current user and one for other user should be shown');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, otherUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 44', 'progress text must be shown');
     assert.strictEqual(coursePage.leaderboard.entries[1].username, currentUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 44', 'progress text must be shown');
 
     await coursePage.repositoryDropdown.click();
     await coursePage.repositoryDropdown.clickOnAction('Try a different language');
 
     assert.strictEqual(coursePage.leaderboard.entries.length, 2, 'one entry for current user and one for other user should be shown');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, otherUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '1 / 44', 'progress text must be shown');
     assert.strictEqual(coursePage.leaderboard.entries[1].username, currentUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 44', 'progress text must be shown');
   });
 
   test('can view leaderboard when current user has completed all stages', async function (assert) {
@@ -425,7 +425,7 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
       createdAt: new Date(2003),
     });
 
-    let replicationFirstStage = this.server.schema.courseStages.findBy({ slug: 'repl-custom-port' });
+    let replicationFirstStage = this.server.schema.courseStages.findBy({ slug: 'bw1' });
 
     this.server.create('submission', 'withStageCompletion', {
       repository: userRepository,
@@ -438,8 +438,8 @@ module('Acceptance | course-page | view-leaderboard', function (hooks) {
 
     assert.strictEqual(coursePage.leaderboard.entries.length, 2, 'one entry for current user and one for other user should be shown');
     assert.strictEqual(coursePage.leaderboard.entries[0].username, currentUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '8 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[0].progressText, '8 / 44', 'progress text must be shown');
     assert.strictEqual(coursePage.leaderboard.entries[1].username, otherUser.username, 'leaderboard entry should correspond to name from API');
-    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 31', 'progress text must be shown');
+    assert.strictEqual(coursePage.leaderboard.entries[1].progressText, '1 / 44', 'progress text must be shown');
   });
 });