Update snapshots

source-academy · Jun 17, 2021 · aae8486 · aae8486
1 parent d637b85
commit aae8486
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/src/commons/application/__tests__/__snapshots__/Application.tsx.snap b/src/commons/application/__tests__/__snapshots__/Application.tsx.snap
@@ -8,8 +8,7 @@ exports[`Application renders correctly 1`] = `
       <Route path=\\"/playground\\" component={[Function: C] { displayName: 'withRouter(Connect(Playground))', WrappedComponent: [Function: Playground], propTypes: { wrappedComponentRef: [Function: bound checkType] { isRequired: [Function: bound checkType] } } }} />
       <Route path=\\"/contributors\\" component={[function]} />
       <Route path=\\"/sourcecast/:sourcecastId?\\" component={[Function: C] { displayName: 'withRouter(Connect(Sourcecast))', WrappedComponent: [Function: Sourcecast], propTypes: { wrappedComponentRef: [Function: bound checkType] { isRequired: [Function: bound checkType] } } }} />
-      <Route path=\\"/githubassessments/editor\\" component={[Function: C] { displayName: 'withRouter(Connect(GitHubAssessmentWorkspace))', WrappedComponent: [Function: GitHubAssessmentWorkspace], propTypes: { wrappedComponentRef: [Function: bound checkType] { isRequired: [Function: bound checkType] } } }} />
-      <Route path=\\"/githubassessments/:selectedType?\\" component={[Function: component]} />
+      <Route path=\\"/githubassessments\\" component={[Function: component]} />
       <Route path=\\"/callback/github\\" component={[Function: GitHubCallback]} />
       <Route exact={true} path=\\"/interactive-sicp\\" render={[Function: redirectToSicp]} />
       <Route path=\\"/interactive-sicp/:section\\" component={[Function: Sicp]} />

diff --git a/src/commons/navigationBar/__tests__/__snapshots__/NavigationBar.tsx.snap b/src/commons/navigationBar/__tests__/__snapshots__/NavigationBar.tsx.snap
@@ -22,7 +22,7 @@ exports[`NavigationBar renders "Not logged in" correctly 1`] = `
           Playground
         </div>
       </NavLink>
-      <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\" to=\\"/githubassessments/classroom\\">
+      <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\" to=\\"/githubassessments\\">
         <Blueprint3.Icon icon=\\"briefcase\\" />
         <div className=\\"navbar-button-text\\">
           Classroom
@@ -82,7 +82,7 @@ exports[`NavigationBar renders correctly with student role 1`] = `
           Playground
         </div>
       </NavLink>
-      <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\" to=\\"/githubassessments/classroom\\">
+      <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\" to=\\"/githubassessments\\">
         <Blueprint3.Icon icon=\\"briefcase\\" />
         <div className=\\"navbar-button-text\\">
           Classroom

diff --git a/src/commons/navigationBar/subcomponents/__tests__/GitHubAssessmentsNavigationBar.tsx b/src/commons/navigationBar/subcomponents/__tests__/GitHubAssessmentsNavigationBar.tsx
@@ -4,13 +4,14 @@ import { shallow } from 'enzyme';
 import GitHubAssessmentsNavigationBar from '../GitHubAssessmentsNavigationBar';
 
 const props = {
+  changeCourseHandler: () => {},
   handleGitHubLogIn: () => {},
   handleGitHubLogOut: () => {},
   octokit: new Octokit(undefined),
   courses: [],
   selectedCourse: '',
   setSelectedCourse: () => {},
-  typeNames: []
+  types: ['Missions', 'Quests']
 };
 
 test('Navbar renders correctly', () => {

diff --git a/...vigationBar/subcomponents/__tests__/__snapshots__/GitHubAssessmentsNavigationBar.tsx.snap b/...vigationBar/subcomponents/__tests__/__snapshots__/GitHubAssessmentsNavigationBar.tsx.snap
@@ -2,9 +2,22 @@
 
 exports[`Navbar renders correctly 1`] = `
 "<Blueprint3.Navbar className=\\"NavigationBar secondary-navbar\\">
-  <Blueprint3.NavbarGroup align=\\"left\\" />
+  <Blueprint3.NavbarGroup align=\\"left\\">
+    <NavLink to={{...}} activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\">
+      <Blueprint3.Icon icon=\\"flame\\" />
+      <div className=\\"navbar-button-text hidden-xs hidden-sm\\">
+        Missions
+      </div>
+    </NavLink>
+    <NavLink to={{...}} activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\">
+      <Blueprint3.Icon icon=\\"lightbulb\\" />
+      <div className=\\"navbar-button-text hidden-xs hidden-sm\\">
+        Quests
+      </div>
+    </NavLink>
+  </Blueprint3.NavbarGroup>
   <Blueprint3.NavbarGroup align=\\"right\\">
-    <Blueprint3.InputGroup disabled={true} leftElement={{...}} placeholder=\\"Select Course\\" onChange={[Function: handleChange]} value=\\"\\" />
+    <Blueprint3.InputGroup disabled={true} leftElement={{...}} placeholder=\\"Select Course\\" onChange={[Function: changeCourseHandler]} value=\\"\\" />
     <ControlBarGitHubLoginButton onClickLogIn={[Function: handleGitHubLogIn]} onClickLogOut={[Function: handleGitHubLogOut]} />
   </Blueprint3.NavbarGroup>
 </Blueprint3.Navbar>"

diff --git a/.../navigationBar/subcomponents/__tests__/__snapshots__/NavigationBarMobileSideMenu.tsx.snap b/.../navigationBar/subcomponents/__tests__/__snapshots__/NavigationBarMobileSideMenu.tsx.snap
@@ -14,10 +14,10 @@ exports[`NavigationBarMobileSideMenu renders "Not logged in" correctly 1`] = `
       Playground
     </div>
   </NavLink>
-  <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link_mobile bp3-button bp3-minimal bp3-large\\" to=\\"/githubassessments/missions\\" onClick={[Function: onClose]}>
+  <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link_mobile bp3-button bp3-minimal bp3-large\\" to=\\"/githubassessments\\" onClick={[Function: onClose]}>
     <Blueprint3.Icon icon=\\"briefcase\\" />
     <div className=\\"navbar-button-text\\">
-      GitHub Assessments
+      Classroom
     </div>
   </NavLink>
   <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link_mobile bp3-button bp3-minimal bp3-large\\" to=\\"/interactive-sicp/index\\" onClick={[Function: onClose]}>
@@ -77,10 +77,10 @@ exports[`NavigationBarMobileSideMenu renders correctly with student role 1`] = `
       Playground
     </div>
   </NavLink>
-  <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link_mobile bp3-button bp3-minimal bp3-large\\" to=\\"/githubassessments/missions\\" onClick={[Function: onClose]}>
+  <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link_mobile bp3-button bp3-minimal bp3-large\\" to=\\"/githubassessments\\" onClick={[Function: onClose]}>
     <Blueprint3.Icon icon=\\"briefcase\\" />
     <div className=\\"navbar-button-text\\">
-      GitHub Assessments
+      Classroom
     </div>
   </NavLink>
   <NavLink activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link_mobile bp3-button bp3-minimal bp3-large\\" to=\\"/interactive-sicp/index\\" onClick={[Function: onClose]}>

diff --git a/src/pages/githubAssessments/GitHubClassroom.tsx b/src/pages/githubAssessments/GitHubClassroom.tsx
@@ -115,10 +115,7 @@ const GitHubClassroom: React.FC<DispatchProps> = props => {
             )
           }
         />
-        <Route
-          path="/githubassessments/editor"
-          component={GitHubAssessmentWorkspaceContainer}
-        />
+        <Route path="/githubassessments/editor" component={GitHubAssessmentWorkspaceContainer} />
         {octokit
           ? types.map((type, idx) => {
               const filteredAssessments = assessmentOverviews?.filter(

diff --git a/src/pages/githubAssessments/__tests__/__snapshots__/GitHubClassroom.tsx.snap b/src/pages/githubAssessments/__tests__/__snapshots__/GitHubClassroom.tsx.snap
@@ -2,9 +2,11 @@
 
 exports[`GitHubClassroom renders correctly 1`] = `
 "<div className=\\"Academy\\">
-  <GitHubAssessmentsNavigationBar handleGitHubLogIn={[Function: handleGitHubLogIn]} handleGitHubLogOut={[Function: handleGitHubLogOut]} octokit={{...}} courses={{...}} selectedCourse=\\"\\" setSelectedCourse={[Function: bound _dispatchAction]} typeNames={{...}} />
-  <div className=\\"Assessment\\">
-    <ContentDisplay display={{...}} loadContentDispatch={[Function: getGitHubOctokitInstance]} />
-  </div>
+  <GitHubAssessmentsNavigationBar changeCourseHandler={[Function: changeCourseHandler]} handleGitHubLogIn={[Function: handleGitHubLogIn]} handleGitHubLogOut={[Function: handleGitHubLogOut]} octokit={{...}} courses={[undefined]} selectedCourse=\\"\\" types={{...}} assessmentOverviews={[undefined]} />
+  <Switch>
+    <Route path=\\"/githubassessments/login\\" render={[Function: render]} />
+    <Route path=\\"/githubassessments/editor\\" component={[Function: C] { displayName: 'withRouter(Connect(GitHubAssessmentWorkspace))', WrappedComponent: [Function: GitHubAssessmentWorkspace], propTypes: { wrappedComponentRef: [Function: bound checkType] { isRequired: [Function: bound checkType] } } }} />
+    <Route render={[Function: redirectToLogin]} />
+  </Switch>
 </div>"
 `;