Merge pull request #129 from rovercode/beta

Push to Production

Author: cabarnes

src/components/Credential.js

@@ -12,8 +12,8 @@ import fileDownload from 'js-file-download';
 
 const defaultState = {
   downloadOpen: false,
-  apName: null,
-  apPassword: null,
+  apName: '',
+  apPassword: '',
 };
 
 class Credential extends Component {
@@ -95,8 +95,8 @@ class Credential extends Component {
             />
           </p>
           <Form id="apForm" onSubmit={this.downloadCredentials}>
-            <Form.Input inline label={networkNameLabel} onChange={this.handleNameChange} required />
-            <Form.Input inline label={networkPasswordLabel} type="password" onChange={this.handlePasswordChange} required />
+            <Form.Input inline label={networkNameLabel} onChange={this.handleNameChange} />
+            <Form.Input inline label={networkPasswordLabel} type="password" onChange={this.handlePasswordChange} />
           </Form>
         </Modal.Content>
         <Modal.Actions>

src/components/Workspace.js

@@ -344,6 +344,10 @@ class Workspace extends Component {
   stepCode = () => {
     const { interpreter, workspace } = this.state;
 
+    if (this.sleeping) {
+      return true;
+    }
+
     const ok = interpreter.step();
     if (!ok) {
       // Program complete, no more code to execute.

src/components/__tests__/Workspace.test.js

@@ -398,6 +398,28 @@ describe('The Workspace component', () => {
     expect(workspace.instance().highlightPause).toBe(false);
   });
 
+  test('stops stepping when sleeping', () => {
+    const wrapper = shallowWithIntl(
+      <Workspace store={store}>
+        <div />
+      </Workspace>, { context },
+    ).dive();
+
+    const mockInterpreter = {
+      step: jest.fn(() => true),
+    };
+    const workspace = wrapper.dive().dive();
+    workspace.setState({
+      interpreter: mockInterpreter,
+    });
+    workspace.update();
+    workspace.instance().sleeping = true;
+    const result = workspace.instance().stepCode();
+
+    expect(result).toBe(true);
+    expect(mockInterpreter.step).not.toHaveBeenCalled();
+  });
+
   test('continues stepping when not at the end', () => {
     const mockStep = jest.fn();
     mockStep.mockReturnValueOnce(true).mockReturnValueOnce(false);

src/components/__tests__/__snapshots__/Credential.test.js.snap

@@ -52,15 +52,13 @@ exports[`The Credential component renders on the page with no errors 1`] = `
         inline={true}
         label="Network Name:"
         onChange={[Function]}
-        required={true}
       />
       <FormInput
         as={[Function]}
         control={[Function]}
         inline={true}
         label="Network Password:"
         onChange={[Function]}
-        required={true}
         type="password"
       />
     </Form>

src/utils/blockly-api.js

@@ -78,7 +78,6 @@ class BlocklyApi {
       interpreter.createNativeFunction(wrapper));
 
     // Add continue API function
-    /* TODO: Make the highlighting stay on continue block while sleeping */
     wrapper = (lengthInMs) => {
       this.beginSleep(lengthInMs);
       this.writeToConsole(`Sleeping for ${lengthInMs}ms.`);