Merge pull request #883 from alexpelan/alexpelan/experimental

Set experimental property in ui if url parameter passed

Author: outoftime

.eslintrc

@@ -50,7 +50,7 @@
         ],
         "complexity": [
           2,
-          {"max": 27}
+          {"max": 30}
         ],
         "computed-property-spacing": [
             2,

src/actions/applicationLoaded.js

@@ -2,5 +2,4 @@ import {createAction} from 'redux-actions';
 
 export default createAction(
   'APPLICATION_LOADED',
-  (gistId = null) => ({gistId}),
 );

src/components/Workspace.jsx

@@ -116,13 +116,17 @@ class Workspace extends React.Component {
   }
 
   componentWillMount() {
-    let gistId;
+    let gistId = null;
+    let isExperimental = false;
     if (location.search) {
       const query = qs.parse(location.search.slice(1));
-      gistId = query.gist;
+      if (query.gist) {
+        gistId = query.gist;
+      }
+      isExperimental = Object.keys(query).includes('experimental');
     }
     history.replaceState({}, '', location.pathname);
-    this.props.dispatch(applicationLoaded(gistId));
+    this.props.dispatch(applicationLoaded({gistId, isExperimental}));
     this._listenForAuthChange();
     startSessionHeartbeat();
   }

src/reducers/ui.js

@@ -165,6 +165,12 @@ export default function ui(stateIn, action) {
     case 'REFRESH_PREVIEW':
       return state.set('lastRefreshTimestamp', action.payload.timestamp);
 
+    case 'APPLICATION_LOADED':
+      if (action.payload.isExperimental) {
+        return state.set('experimental', true);
+      }
+      return state.set('experimental', false);
+
     default:
       return state;
   }

test/unit/reducers/ui.js

@@ -25,6 +25,7 @@ import {
 } from '../../../src/actions/clients';
 import {EmptyGistError} from '../../../src/clients/gists';
 import {userLoggedOut} from '../../../src/actions/user';
+import {applicationLoaded} from '../../../src/actions/';
 
 const initialState = Immutable.fromJS({
   editors: {
@@ -246,3 +247,19 @@ test('refreshPreview', reducerTest(
   partial(refreshPreview, 1),
   initialState.set('lastRefreshTimestamp', 1),
 ));
+
+test('applicationLoaded', (t) => {
+  t.test('isExperimental = true', reducerTest(
+    reducer,
+    initialState,
+    partial(applicationLoaded, {gistId: null, isExperimental: true}),
+    initialState.set('experimental', true),
+  ));
+
+  t.test('isExperimental = false', reducerTest(
+    reducer,
+    initialState,
+    partial(applicationLoaded, {gistId: null, isExperimental: false}),
+    initialState.set('experimental', false),
+  ));
+});

test/unit/sagas/projects.js

@@ -72,7 +72,7 @@ test('changeCurrentProject()', (assert) => {
 
 test('applicationLoaded()', (t) => {
   t.test('with no gist ID', (assert) => {
-    testSaga(applicationLoadedSaga, applicationLoaded(null)).
+    testSaga(applicationLoadedSaga, applicationLoaded({gistId: null})).
       next().call(createProjectSaga).
       next().isDone();
 
@@ -81,8 +81,8 @@ test('applicationLoaded()', (t) => {
 
   t.test('with gist ID', (assert) => {
     const gistId = '123abc';
-    testSaga(applicationLoadedSaga, applicationLoaded(gistId)).
-      next().call(importGistSaga, applicationLoaded(gistId)).
+    testSaga(applicationLoadedSaga, applicationLoaded({gistId})).
+      next().call(importGistSaga, applicationLoaded({gistId})).
       next().isDone();
 
     assert.end();
@@ -93,7 +93,7 @@ test('importGist()', (t) => {
   const gistId = 'abc123';
 
   t.test('with successful import', (assert) => {
-    const saga = testSaga(importGistSaga, applicationLoaded(gistId));
+    const saga = testSaga(importGistSaga, applicationLoaded({gistId}));
 
     saga.next().call(loadFromId, gistId, {authenticated: false});
 
@@ -122,7 +122,7 @@ test('importGist()', (t) => {
   });
 
   t.test('with not found error', (assert) => {
-    testSaga(importGistSaga, applicationLoaded(gistId)).
+    testSaga(importGistSaga, applicationLoaded({gistId})).
       next().call(loadFromId, gistId, {authenticated: false}).
       throw(
         Object.create(new Error(), {response: {value: {status: 404}}}),
@@ -132,7 +132,7 @@ test('importGist()', (t) => {
   });
 
   t.test('with other error', (assert) => {
-    testSaga(importGistSaga, applicationLoaded(gistId)).
+    testSaga(importGistSaga, applicationLoaded({gistId})).
       next().call(loadFromId, gistId, {authenticated: false}).
       throw(new Error()).put(gistImportError()).
       next().isDone();

test/unit/sagas/user.js

@@ -9,7 +9,7 @@ import {getInitialUserState} from '../../../src/clients/firebaseAuth';
 
 test('applicationLoaded', (t) => {
   t.test('with no logged in user', (assert) => {
-    testSaga(applicationLoadedSaga, applicationLoaded()).
+    testSaga(applicationLoadedSaga, applicationLoaded({})).
       next().call(getInitialUserState).
       next(null).isDone();
 
@@ -21,7 +21,7 @@ test('applicationLoaded', (t) => {
       user: {uid: 'student1'},
       credential: {provider: 'github.com'},
     };
-    testSaga(applicationLoadedSaga, applicationLoaded()).
+    testSaga(applicationLoadedSaga, applicationLoaded({})).
       next().call(getInitialUserState).
       next(userCredential).put(userAuthenticated(userCredential)).
       next().isDone();