Skip to content

Commit

Permalink
fix: all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
spaenleh committed Mar 4, 2024
1 parent 8d354d2 commit 4534a38
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 53 deletions.
28 changes: 23 additions & 5 deletions cypress/e2e/builder/main.cy.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,41 @@
import { Context, PermissionLevel } from '@graasp/sdk';

import { BUILDER_VIEW_CY, buildDataCy } from '../../../src/config/selectors';
import {
BUILDER_VIEW_CY,
PLAYER_VIEW_CY,
buildDataCy,
} from '../../../src/config/selectors';

describe('Builder View', () => {
beforeEach(() => {
cy.setUpApi(
{},
{
context: Context.Builder,
permission: PermissionLevel.Read,
permission: PermissionLevel.Admin,
},
);
cy.visit('/');
});

it('App', () => {
cy.get(buildDataCy(BUILDER_VIEW_CY)).should(
'contain.text',
'Builder as read',
cy.get(buildDataCy(BUILDER_VIEW_CY)).should('be.visible');
});
});

describe('Builder View as Reader', () => {
beforeEach(() => {
cy.setUpApi(
{},
{
context: Context.Builder,
permission: PermissionLevel.Read,
},
);
cy.visit('/');
});

it('App', () => {
cy.get(buildDataCy(PLAYER_VIEW_CY)).should('be.visible');
});
});
9 changes: 3 additions & 6 deletions cypress/e2e/player/main.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,19 @@ import { Context, PermissionLevel } from '@graasp/sdk';

import { PLAYER_VIEW_CY, buildDataCy } from '../../../src/config/selectors';

describe('Player View', () => {
describe('Player View as Reader', () => {
beforeEach(() => {
cy.setUpApi(
{},
{
context: Context.Player,
permission: PermissionLevel.Write,
permission: PermissionLevel.Read,
},
);
cy.visit('/');
});

it('App', () => {
cy.get(buildDataCy(PLAYER_VIEW_CY)).should(
'contain.text',
'Player as write',
);
cy.get(buildDataCy(PLAYER_VIEW_CY)).should('be.visible');
});
});
2 changes: 1 addition & 1 deletion src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Sentry.init({
if (MOCK_API) {
mockApi(
{
externalUrls: [],
externalUrls: [({ url }) => url.includes('BuildBoxRace')],
dbName: window.Cypress ? 'graasp-app-cypress' : undefined,
appContext: window.Cypress ? window.appContext : defaultMockContext,
database: window.Cypress ? window.database : buildDatabase(mockMembers),
Expand Down
85 changes: 44 additions & 41 deletions src/modules/main/BuilderView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { PermissionLevel } from '@graasp/sdk';
import { BUILDER_VIEW_CY } from '@/config/selectors';

import AnalyticsView from './AnalyticsView';
import PlayerView from './PlayerView';
import SettingsView from './SettingsView';
import UnityView from './UnityView';

Expand All @@ -25,46 +26,48 @@ const BuilderView = (): JSX.Element => {
const { permission } = useLocalContext();

const [activeTab, setActiveTab] = useState(Tabs.SIM_SETTINGS_VIEW);

return (
<Stack data-cy={BUILDER_VIEW_CY}>
<TabContext data-cy={BUILDER_VIEW_CY} value={activeTab}>
<TabList
onChange={(_, newTabs) => setActiveTab(newTabs)}
centered
textColor="secondary"
indicatorColor="secondary"
>
<Tab
value={Tabs.SIM_ANALYTICS_VIEW}
label={t('Analytics')}
icon={<Analytics />}
iconPosition="start"
/>
<Tab
value={Tabs.SIM_SETTINGS_VIEW}
label={t('Settings')}
icon={<Settings />}
iconPosition="start"
/>
<Tab
value={Tabs.SIM_DEMO_VIEW}
label={t('Preview')}
icon={<ViewInArOutlined />}
iconPosition="start"
/>
</TabList>
<TabPanel value={Tabs.SIM_ANALYTICS_VIEW}>
<AnalyticsView />
</TabPanel>
<TabPanel value={Tabs.SIM_SETTINGS_VIEW}>
{permission === PermissionLevel.Admin && <SettingsView />}
</TabPanel>
<TabPanel value={Tabs.SIM_DEMO_VIEW}>
<UnityView recordingComponent saveUnityTraceToAppAction />
</TabPanel>
</TabContext>
</Stack>
);
if (permission === PermissionLevel.Admin) {
return (
<Stack data-cy={BUILDER_VIEW_CY}>
<TabContext data-cy={BUILDER_VIEW_CY} value={activeTab}>
<TabList
onChange={(_, newTabs) => setActiveTab(newTabs)}
centered
textColor="secondary"
indicatorColor="secondary"
>
<Tab
value={Tabs.SIM_ANALYTICS_VIEW}
label={t('Analytics')}
icon={<Analytics />}
iconPosition="start"
/>
<Tab
value={Tabs.SIM_SETTINGS_VIEW}
label={t('Settings')}
icon={<Settings />}
iconPosition="start"
/>
<Tab
value={Tabs.SIM_DEMO_VIEW}
label={t('Preview')}
icon={<ViewInArOutlined />}
iconPosition="start"
/>
</TabList>
<TabPanel value={Tabs.SIM_ANALYTICS_VIEW}>
<AnalyticsView />
</TabPanel>
<TabPanel value={Tabs.SIM_SETTINGS_VIEW}>
<SettingsView />
</TabPanel>
<TabPanel value={Tabs.SIM_DEMO_VIEW}>
<UnityView recordingComponent saveUnityTraceToAppAction />
</TabPanel>
</TabContext>
</Stack>
);
}
return <PlayerView />;
};
export default BuilderView;

0 comments on commit 4534a38

Please sign in to comment.