Merge pull request #309 from graasp/306/testsFix

fix: fix minor test issues
graasp · Aug 4, 2020 · 92fa3d8 · 92fa3d8
2 parents 40270d2 + d023709
commit 92fa3d8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/src/components/Settings.js b/src/components/Settings.js
@@ -12,7 +12,7 @@ import LanguageSelect from './common/LanguageSelect';
 import DeveloperSwitch from './common/DeveloperSwitch';
 import GeolocationControl from './common/GeolocationControl';
 import Main from './common/Main';
-import { SETTINGS_MAIN_ID } from '../config/selectors';
+import { SETTINGS_MAIN_ID, SETTINGS_TITLE_ID } from '../config/selectors';
 import SyncAdvancedSwitch from './space/sync/SyncAdvancedSwitch';
 import StudentModeSwitch from './common/StudentModeSwitch';
 import ActionEnabledSwitch from './common/ActionEnabledSwitch';
@@ -51,7 +51,7 @@ export class Settings extends Component {
     return (
       <Main id={SETTINGS_MAIN_ID}>
         <div className={classes.settings}>
-          <Typography variant="h4" color="inherit">
+          <Typography variant="h4" color="inherit" id={SETTINGS_TITLE_ID}>
             {t('Settings')}
           </Typography>
           <FormGroup>

diff --git a/src/components/__snapshots__/Settings.test.js.snap b/src/components/__snapshots__/Settings.test.js.snap
@@ -9,6 +9,7 @@ exports[`<Settings /> renders correctly 1`] = `
   >
     <WithStyles(ForwardRef(Typography))
       color="inherit"
+      id="settingsTitle"
       variant="h4"
     >
       Settings

diff --git a/src/config/selectors.js b/src/config/selectors.js
@@ -66,6 +66,7 @@ export const buildCheckboxLabel = name => `checkboxLabel-${name}`;
 export const EXPORT_SPACE_BUTTON_ID = 'exportSpaceButton';
 export const EXPORT_SPACE_BACK_BUTTON_ID = 'exportSpaceBackButton';
 
+export const SETTINGS_TITLE_ID = 'settingsTitle';
 export const LANGUAGE_SELECT_ID = 'settingsLanguageSelect';
 export const DEVELOPER_SWITCH_ID = 'settingsDeveloperSwitch';
 export const GEOLOCATION_CONTROL_ID = 'settingsGeolocationControl';

diff --git a/test/settings.test.js b/test/settings.test.js
@@ -15,7 +15,6 @@ import {
 } from './utils';
 import { createApplication, closeApplication } from './application';
 import {
-  SETTINGS_MAIN_ID,
   LANGUAGE_SELECT_ID,
   GEOLOCATION_CONTROL_ID,
   DEVELOPER_SWITCH_ID,
@@ -28,6 +27,7 @@ import {
   SYNC_VISUAL_MAIN_ID,
   SYNC_ADVANCED_MAIN_ID,
   SYNC_CANCEL_BUTTON_ID,
+  SETTINGS_TITLE_ID,
 } from '../src/config/selectors';
 import {
   DEFAULT_GLOBAL_TIMEOUT,
@@ -182,7 +182,7 @@ describe('Settings Scenarios', function() {
         await menuGoToSettings(client);
 
         // check settings screen displays in english
-        const settingsTitle = await client.getText(`#${SETTINGS_MAIN_ID} h5`);
+        const settingsTitle = await client.getText(`#${SETTINGS_TITLE_ID}`);
         expect(settingsTitle).to.equal(i18n.t('Settings'));
         const languageSelectTitle = await client.getText(
           `#${LANGUAGE_SELECT_ID} label`
@@ -204,7 +204,7 @@ describe('Settings Scenarios', function() {
         await i18n.changeLanguage('fr');
 
         // check settings screen displays in english
-        const settingsTitleFr = await client.getText(`#${SETTINGS_MAIN_ID} h5`);
+        const settingsTitleFr = await client.getText(`#${SETTINGS_TITLE_ID}`);
         expect(settingsTitleFr).to.equal(i18n.t('Settings'));
         const languageSelectTitleFr = await client.getText(
           `#${LANGUAGE_SELECT_ID} label`

diff --git a/test/spaces/loadSpace.test.js b/test/spaces/loadSpace.test.js
@@ -344,7 +344,7 @@ describe('Load Space Scenarios', function() {
           await client.click(`#${LOAD_SUBMIT_BUTTON_ID}`);
           await client.pause(LOAD_SELECTION_SPACE_PAUSE);
 
-          await menuGoToHome(client);
+          await menuGoToSavedSpaces(client);
 
           await expectElementToExist(client, `#${SPACE_NOT_AVAILABLE_TEXT_ID}`);
         })