Merge branch 'master' of https://github.com/popcodeorg/popcode into element-highlighter

Author: pwjablonski

src/clients/googleClassroom.js

@@ -2,9 +2,9 @@ import qs from 'qs';
 
 const BASE_URL = 'https://classroom.google.com/u/0/share?';
 
-export function createShareToClassroomUrl(snapshotKey) {
+export function createShareToClassroomUrl(snapshotKey, title) {
   const uri = document.createElement('a');
   uri.href = '/';
   uri.search = `snapshot=${snapshotKey}`;
-  return BASE_URL + qs.stringify({url: uri.href});
+  return BASE_URL + qs.stringify({url: uri.href, title});
 }

src/sagas/clients.js

@@ -14,6 +14,7 @@ import {
   projectExportError,
 } from '../actions/clients';
 import {getCurrentProject} from '../selectors';
+import {generateTextPreview} from '../util/compileProject';
 
 export function* createSnapshot() {
   const project = yield select(getCurrentProject);
@@ -38,7 +39,8 @@ export function* exportProject({payload: {exportType}}) {
       ({html_url: url} = yield call(createRepoFromProject, project, user));
     } else if (exportType === 'classroom') {
       const snapshotKey = yield call(createProjectSnapshot, project);
-      url = yield call(createShareToClassroomUrl, snapshotKey);
+      const projectTitle = yield call(generateTextPreview, project);
+      url = yield call(createShareToClassroomUrl, snapshotKey, projectTitle);
     }
     yield put(projectExported(url, exportType));
   } catch (e) {

test/unit/sagas/clients.js

@@ -18,6 +18,7 @@ import {
 import {createProjectSnapshot} from '../../../src/clients/firebase';
 import {createShareToClassroomUrl} from '../../../src/clients/googleClassroom';
 import {getCurrentProject} from '../../../src/selectors';
+import {generateTextPreview} from '../../../src/util/compileProject';
 
 test('createSnapshot()', (t) => {
   const {project} = new Scenario();
@@ -121,6 +122,7 @@ test('export to classroom', (t) => {
     'https://classroom.google.com/u/0/share?url=http://popcode.org';
   const exportType = 'classroom';
   const snapshotKey = '123-456';
+  const projectTitle = 'Page Title';
   const scenario = new Scenario();
   scenario.logIn();
 
@@ -134,8 +136,13 @@ test('export to classroom', (t) => {
         scenario.project.toJS(),
       ).
       next(snapshotKey).call(
+        generateTextPreview,
+        scenario.project.toJS(),
+      ).
+      next(projectTitle).call(
         createShareToClassroomUrl,
         snapshotKey,
+        projectTitle,
       );
   }