test: update test to work with student as default user mode

Author: pyphilia

public/app/config/config.js

@@ -43,8 +43,8 @@ const PRODUCT_NAME = 'Graasp';
 const TMP_FOLDER = 'tmp';
 const DEFAULT_LANG = 'en';
 const DEFAULT_DEVELOPER_MODE = false;
-const TEACHER_USER_MODE = 'student';
-const DEFAULT_USER_MODE = TEACHER_USER_MODE;
+const STUDENT_USER_MODE = 'student';
+const DEFAULT_USER_MODE = STUDENT_USER_MODE;
 const DEFAULT_GEOLOCATION_ENABLED = false;
 const VISUAL_SYNC_MODE = 'visual';
 const DEFAULT_SYNC_MODE = VISUAL_SYNC_MODE;

src/components/common/DrawerHeader.js

@@ -18,6 +18,7 @@ import {
   USER_MODES,
   THEME_COLORS,
 } from '../../config/constants';
+import { DRAWER_HEADER_TEACHER_ICON_ID } from '../../config/selectors';
 
 const styles = () => ({
   drawerHeader: {
@@ -50,7 +51,10 @@ const DrawerHeader = ({
     >
       <ListItemIcon>
         {isTeacher ? (
-          <TeacherIcon className={classes.teacherColor} />
+          <TeacherIcon
+            className={classes.teacherColor}
+            id={DRAWER_HEADER_TEACHER_ICON_ID}
+          />
         ) : (
           <PersonIcon />
         )}

src/components/common/MainMenu.js

@@ -93,6 +93,7 @@ export class MainMenu extends Component {
       authenticated,
       t,
       match: { path },
+      history: { push },
     } = this.props;
 
     if (authenticated) {
@@ -101,6 +102,10 @@ export class MainMenu extends Component {
           id={SIGN_OUT_MENU_ITEM_ID}
           onClick={() => {
             this.handleSignOut();
+
+            // manual redirect for pages (settings) which are
+            // also available when disconnected
+            push(SIGN_IN_PATH);
           }}
           selected={path === SIGN_IN_PATH}
           button

src/config/selectors.js

@@ -143,3 +143,5 @@ export const EDIT_USER_IN_CLASSROOM_DELETE_DATA_BUTTON_CLASS =
 export const EDIT_CLASSROOM_DELETE_DATA_BUTTON_CLASS =
   'editClassroomDeleteDataButton';
 export const buildTableCellSpaceId = id => `tableCellSpace-${id}`;
+
+export const DRAWER_HEADER_TEACHER_ICON_ID = 'drawerHeaderTeacherIcon';

test/classrooms.test.js

@@ -10,6 +10,11 @@ import {
   expectElementToExist,
   toggleStudentMode,
   clearInput,
+  menuGoToSettings,
+  menuGoToClassrooms,
+  menuGoToSignOut,
+  userSignIn,
+  openDrawer,
 } from './utils';
 import { createApplication, closeApplication } from './application';
 import {
@@ -63,14 +68,7 @@ import {
   SELECT_OPEN_PAUSE,
   OPEN_IMPORT_DATA_IN_CLASSROOM_PAUSE,
 } from './constants';
-import {
-  openDrawer,
-  menuGoToSettings,
-  menuGoToClassrooms,
-  menuGoToSignOut,
-} from './menu.test';
-import { userSignIn } from './userSignIn.test';
-import { USER_GRAASP, USER_ALICE, USER_BOB } from './fixtures/users';
+import { USER_GRAASP, USER_ALICE } from './fixtures/users';
 import {
   checkLoadSelectionLayout,
   setCheckboxesTo,
@@ -449,8 +447,8 @@ describe('Classrooms Scenarios', function() {
 
         await menuGoToSignOut(client);
 
-        // add classroom as bob
-        await userSignIn(client, USER_BOB);
+        // add classroom as graasp
+        await userSignIn(client, USER_GRAASP);
 
         await menuGoToClassrooms(client);
 

test/fixtures/settings.js

@@ -5,7 +5,7 @@ import {
   SYNC_MODES,
   DEFAULT_SYNC_MODE,
 } from '../../src/config/constants';
-import { USER_ALICE, USER_GRAASP, USER_BOB } from './users';
+import { USER_ALICE, USER_GRAASP, USER_CEDRIC } from './users';
 
 /* eslint-disable-next-line import/prefer-default-export */
 export const settingsPerUser = {
@@ -21,7 +21,7 @@ export const settingsPerUser = {
     geolocationEnabled: true,
     syncMode: SYNC_MODES.ADVANCED,
   },
-  [USER_BOB.name]: {
+  [USER_CEDRIC.name]: {
     lang: 'ja',
     developerMode: true,
     geolocationEnabled: DEFAULT_GEOLOCATION_ENABLED,

test/fixtures/users.js

@@ -1,15 +1,25 @@
-/* eslint-disable-next-line import/prefer-default-export */
+import { USER_MODES } from '../../src/config/constants';
+
 export const USER_GRAASP = {
   name: 'graasp',
   id: 'graasp-id',
+  mode: USER_MODES.TEACHER,
 };
 
 export const USER_ALICE = {
   name: 'alice',
   id: 'alice-id',
+  mode: USER_MODES.TEACHER,
 };
 
 export const USER_BOB = {
   name: 'bob',
   id: 'bob-id',
+  mode: USER_MODES.STUDENT,
+};
+
+export const USER_CEDRIC = {
+  name: 'cedric',
+  id: 'cedric-id',
+  mode: USER_MODES.TEACHER,
 };

test/menu.test.js

@@ -1,105 +1,19 @@
-/* eslint-disable no-unused-expressions */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
-import { expect } from 'chai';
-import { mochaAsync } from './utils';
-import { createApplication, closeApplication } from './application';
-import {
-  DRAWER_BUTTON_ID,
-  LOAD_MAIN_ID,
-  LOAD_MENU_ITEM_ID,
-  VISIT_MAIN_ID,
-  VISIT_MENU_ITEM_ID,
-  SETTINGS_MAIN_ID,
-  SETTINGS_MENU_ITEM_ID,
-  SPACES_NEARBY_MENU_ITEM_ID,
-  SPACES_NEARBY_MAIN_ID,
-  HOME_MENU_ITEM_ID,
-  HOME_MAIN_ID,
-  DASHBOARD_MAIN_ID,
-  DASHBOARD_MENU_ITEM_ID,
-  DEVELOPER_MENU_ITEM_ID,
-  DEVELOPER_MAIN_ID,
-  SIGN_OUT_MENU_ITEM_ID,
-  PHASE_MENU_LIST_ID,
-  buildPhaseMenuItemId,
-  SAVED_SPACES_MENU_ITEM_ID,
-  SAVED_SPACES_MAIN_ID,
-  CLASSROOMS_MAIN_ID,
-  CLASSROOMS_MENU_ITEM_ID,
-} from '../src/config/selectors';
 import {
-  LOAD_TAB_PAUSE,
-  DEFAULT_GLOBAL_TIMEOUT,
-  OPEN_DRAWER_PAUSE,
-  LOAD_PHASE_PAUSE,
-} from './constants';
-import { userSignIn } from './userSignIn.test';
+  mochaAsync,
+  userSignIn,
+  menuGoToSpacesNearby,
+  menuGoToVisitSpace,
+  menuGoToLoadSpace,
+  menuGoToSettings,
+  menuGoToDashboard,
+  menuGoToSavedSpaces,
+} from './utils';
+import { createApplication, closeApplication } from './application';
+import { DEFAULT_GLOBAL_TIMEOUT } from './constants';
 import { USER_GRAASP } from './fixtures/users';
 
-export const openDrawer = async client => {
-  if (await client.isVisible(`#${DRAWER_BUTTON_ID}`)) {
-    await client.click(`#${DRAWER_BUTTON_ID}`);
-  }
-  await client.pause(OPEN_DRAWER_PAUSE);
-};
-
-const menuGoTo = async (client, menuItemId, elementToExpectId = null) => {
-  // open menu if it is closed
-  await openDrawer(client);
-  await client.click(`#${menuItemId}`);
-  if (elementToExpectId) {
-    expect(await client.isExisting(`#${elementToExpectId}`)).to.be.true;
-  }
-  await client.pause(LOAD_TAB_PAUSE);
-};
-
-export const menuGoToPhase = async (client, nb) => {
-  await openDrawer(client);
-  await client.click(`#${PHASE_MENU_LIST_ID} li#${buildPhaseMenuItemId(nb)}`);
-  await client.pause(LOAD_PHASE_PAUSE);
-};
-
-export const menuGoToSettings = async client => {
-  await menuGoTo(client, SETTINGS_MENU_ITEM_ID, SETTINGS_MAIN_ID);
-};
-
-export const menuGoToDeveloper = async client => {
-  await menuGoTo(client, DEVELOPER_MENU_ITEM_ID, DEVELOPER_MAIN_ID);
-};
-
-export const menuGoToSpacesNearby = async client => {
-  await menuGoTo(client, SPACES_NEARBY_MENU_ITEM_ID, SPACES_NEARBY_MAIN_ID);
-};
-
-export const menuGoToVisitSpace = async client => {
-  await menuGoTo(client, VISIT_MENU_ITEM_ID, VISIT_MAIN_ID);
-};
-
-export const menuGoToLoadSpace = async client => {
-  await menuGoTo(client, LOAD_MENU_ITEM_ID, LOAD_MAIN_ID);
-};
-
-export const menuGoToDashboard = async client => {
-  await menuGoTo(client, DASHBOARD_MENU_ITEM_ID, DASHBOARD_MAIN_ID);
-};
-
-export const menuGoToSignOut = async client => {
-  await menuGoTo(client, SIGN_OUT_MENU_ITEM_ID);
-};
-
-export const menuGoToHome = async client => {
-  await menuGoTo(client, HOME_MENU_ITEM_ID, HOME_MAIN_ID);
-};
-
-export const menuGoToSavedSpaces = async client => {
-  await menuGoTo(client, SAVED_SPACES_MENU_ITEM_ID, SAVED_SPACES_MAIN_ID);
-};
-
-export const menuGoToClassrooms = async client => {
-  await menuGoTo(client, CLASSROOMS_MENU_ITEM_ID, CLASSROOMS_MAIN_ID);
-};
-
 describe('Menu Scenarios', function() {
   this.timeout(DEFAULT_GLOBAL_TIMEOUT);
   let app;

test/settings.test.js

@@ -12,6 +12,13 @@ import {
   toggleGeolocationEnabled,
   toggleSyncAdvancedMode,
   changeLanguage,
+  openDrawer,
+  menuGoToSettings,
+  menuGoToSavedSpaces,
+  menuGoToDeveloper,
+  menuGoToSpacesNearby,
+  menuGoToSignOut,
+  userSignIn,
 } from './utils';
 import { createApplication, closeApplication } from './application';
 import {
@@ -35,23 +42,14 @@ import {
   LOAD_TAB_PAUSE,
   SYNC_OPEN_SCREEN_PAUSE,
 } from './constants';
-import {
-  openDrawer,
-  menuGoToSettings,
-  menuGoToSavedSpaces,
-  menuGoToDeveloper,
-  menuGoToSpacesNearby,
-  menuGoToSignOut,
-} from './menu.test';
 import {
   DEFAULT_LANGUAGE,
   DEFAULT_GEOLOCATION_ENABLED,
   DEFAULT_DEVELOPER_MODE,
   DEFAULT_SYNC_MODE,
   SYNC_MODES,
 } from '../src/config/constants';
-import { userSignIn } from './userSignIn.test';
-import { USER_GRAASP, USER_ALICE, USER_BOB } from './fixtures/users';
+import { USER_GRAASP, USER_ALICE, USER_CEDRIC } from './fixtures/users';
 import { settingsPerUser } from './fixtures/settings';
 import { loadSpaceById } from './spaces/loadSpace.test';
 import {
@@ -271,7 +269,7 @@ describe('Settings Scenarios', function() {
       'Settings are saved for each user',
       mochaAsync(async () => {
         const { client } = app;
-        const users = [USER_GRAASP, USER_ALICE, USER_BOB];
+        const users = [USER_GRAASP, USER_ALICE, USER_CEDRIC];
         for (const user of users) {
           const {
             lang,

test/spaceSearch.test.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 import { expect } from 'chai';
-import { mochaAsync } from './utils';
+import { mochaAsync, userSignIn } from './utils';
 import { createApplication, closeApplication } from './application';
 import {
   SPACE_SEARCH_INPUT_ID,
@@ -13,7 +13,6 @@ import {
   SPACE_SEARCH_PAUSE,
   TOOLTIP_FADE_OUT_PAUSE,
 } from './constants';
-import { userSignIn } from './userSignIn.test';
 import { USER_GRAASP } from './fixtures/users';
 import { loadSpaceById } from './spaces/loadSpace.test';
 import { searchSpacesFixtures } from './fixtures/searchSpaces';

test/spaces/clearUserInput.test.js

@@ -1,13 +1,14 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
-import { mochaAsync } from '../utils';
-import { createApplication, closeApplication } from '../application';
 import {
+  mochaAsync,
+  userSignIn,
   menuGoToSavedSpaces,
   menuGoToPhase,
   menuGoToSignOut,
-} from '../menu.test';
+} from '../utils';
+import { createApplication, closeApplication } from '../application';
 import {
   buildSpaceCardId,
   SPACE_CLEAR_BUTTON_CLASS,
@@ -23,7 +24,6 @@ import {
   TOOLTIP_FADE_OUT_PAUSE,
   OPEN_SAVED_SPACE_PAUSE,
 } from '../constants';
-import { userSignIn } from '../userSignIn.test';
 import { USER_GRAASP, USER_BOB, USER_ALICE } from '../fixtures/users';
 import {
   typeInTextInputApp,
@@ -156,12 +156,7 @@ describe('Clear User Input in a space', function() {
           const text1 = 'some user input conceptualisation';
 
           // load space with user input
-          await loadSpaceById(
-            client,
-
-            SPACE_ATOMIC_STRUCTURE_PATH,
-            spaceId
-          );
+          await loadSpaceById(client, SPACE_ATOMIC_STRUCTURE_PATH, spaceId);
 
           // add user input
           await menuGoToPhase(client, 0);

test/spaces/deleteSpace.test.js

@@ -2,17 +2,15 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 import { expect } from 'chai';
-import { mochaAsync } from '../utils';
+import { mochaAsync, userSignIn, menuGoToSavedSpaces } from '../utils';
 import { createApplication, closeApplication } from '../application';
-import { menuGoToSavedSpaces } from '../menu.test';
 import {
   buildSpaceCardId,
   SPACE_DELETE_BUTTON_CLASS,
 } from '../../src/config/selectors';
 import { SPACE_ATOMIC_STRUCTURE } from '../fixtures/spaces';
 import { visitAndSaveSpaceById } from './visitSpace.test';
 import { DELETE_SPACE_PAUSE, DEFAULT_GLOBAL_TIMEOUT } from '../constants';
-import { userSignIn } from '../userSignIn.test';
 import { USER_GRAASP } from '../fixtures/users';
 
 describe('Delete a space', function() {