pass solution and test to reducer

Author: ShMcK

lib/components/Test/Solution.js

@@ -24,22 +24,29 @@ var styles = {
     card: {
         margin: '5px',
     },
+    buttons: {
+        textAlign: 'center',
+    },
 };
 var Solution = (function (_super) {
     __extends(Solution, _super);
     function Solution() {
         _super.apply(this, arguments);
     }
     Solution.prototype.runTest = function () {
-        console.log(this.refs.solution.get());
+        var text = "\n" + this.refs.solution.get() + "\n" + atom.workspace.getActiveTextEditor().getText() + "\n";
+        this.props.runTestOnSolution(text);
     };
     Solution.prototype.render = function () {
         return (React.createElement(Card_1.Card, {style: styles.card, initiallyExpanded: true}, 
             React.createElement(Card_1.CardTitle, {title: 'Solution'}), 
             React.createElement(Card_1.CardText, {expandable: true}, 
-                React.createElement(index_1.TextEditor, {name: 'solution', ref: 'solution', placeholder: 'test your solution against tests', lang: this.props.language}), 
+                React.createElement("p", null, "Test a solution against your tests"), 
+                React.createElement(index_1.TextEditor, {name: 'solution', ref: 'solution', placeholder: 'var a = "example code";', lang: this.props.language}), 
                 React.createElement("br", null), 
-                React.createElement(RaisedButton_1.default, {label: 'Run Test', primary: true, onTouchTap: this.runTest.bind(this)}))));
+                React.createElement("div", {style: styles.buttons}, 
+                    React.createElement(RaisedButton_1.default, {label: 'Run Test', primary: true, onTouchTap: this.runTest.bind(this)})
+                ))));
     };
     Solution = __decorate([
         react_redux_1.connect(function (state) { return ({

lib/modules/validate-tutorial/actions.js

@@ -7,9 +7,9 @@ function validateTutorial() {
     };
 }
 exports.validateTutorial = validateTutorial;
-function runTestOnSolution() {
+function runTestOnSolution(text) {
     return function (dispatch, getState) {
-        dispatch({ type: types_1.RUN_TEST_ON_SOLUTION });
+        dispatch({ type: types_1.RUN_TEST_ON_SOLUTION, payload: { text: text } });
     };
 }
 exports.runTestOnSolution = runTestOnSolution;

lib/modules/validate-tutorial/reducer.js

@@ -11,6 +11,7 @@ function validation(v, action) {
         case types_1.VALIDATE_TUTORIAL:
             return coderoad_cli_1.validatePackageJson(action.payload.packageJson);
         case types_1.RUN_TEST_ON_SOLUTION:
+            console.log(action.payload.text);
             return v;
         default:
             return v;

src/components/Test/Solution.tsx

@@ -10,20 +10,28 @@ const styles = {
   card: {
     margin: '5px',
   },
+  buttons: {
+    textAlign: 'center',
+  },
 };
 
 @connect(state => ({
   language: languageSuffixSelector(state),
 }), {runTestOnSolution})
 export default class Solution extends React.Component <{
   language?: string,
+  runTestOnSolution?: (text: string) => Redux.ActionCreator,
 }, {}> {
   refs: {
     [key: string]: Element;
     solution: any;
   };
   runTest() {
-    console.log(this.refs.solution.get());
+    const text = `
+${this.refs.solution.get()}
+${atom.workspace.getActiveTextEditor().getText()}
+`;
+    this.props.runTestOnSolution(text);
   }
   render() {
     return (
@@ -34,18 +42,21 @@ export default class Solution extends React.Component <{
         <CardTitle title='Solution' />
 
         <CardText expandable={true}>
+          <p>Test a solution against your tests</p>
           <TextEditor
             name='solution'
             ref='solution'
-            placeholder='test your solution against tests'
+            placeholder='var a = "example code";'
             lang={this.props.language}
           />
           <br />
-          <RaisedButton
-            label='Run Test'
-            primary={true}
-            onTouchTap={this.runTest.bind(this)}
-          />
+          <div style={styles.buttons}>
+            <RaisedButton
+              label='Run Test'
+              primary={true}
+              onTouchTap={this.runTest.bind(this)}
+            />
+          </div>
         </CardText>
       </Card>
     );

src/modules/validate-tutorial/actions.ts

@@ -7,8 +7,8 @@ export function validateTutorial() {
   };
 }
 
-export function runTestOnSolution() {
+export function runTestOnSolution(text: string) {
   return (dispatch, getState) => {
-    dispatch({ type: RUN_TEST_ON_SOLUTION });
+    dispatch({ type: RUN_TEST_ON_SOLUTION, payload: {text} });
   };
 }

src/modules/validate-tutorial/reducer.ts

@@ -11,6 +11,7 @@ export default function validation(v = _v, action: Action): Validation.Object {
     case VALIDATE_TUTORIAL:
       return validatePackageJson(action.payload.packageJson);
     case RUN_TEST_ON_SOLUTION:
+      console.log(action.payload.text);
       return v;
     default:
       return v;