Merge pull request #2090 from ethcore/js-gitlab-testing

gitlab testing & build processes

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
   - deploy
 variables:
   GIT_DEPTH: "3"
-  SIMPLECOV: "true" 
+  SIMPLECOV: "true"
   RUST_BACKTRACE: "1"
 cache:
   key: "$CI_BUILD_NAME/$CI_BUILD_REF_NAME"
@@ -244,7 +244,9 @@ test-linux:
   stage: test
   before_script:
     - git submodule update --init --recursive
+    - ./js/scripts/install-deps.sh
   script:
+    - ./js/scripts/test.sh
     - ./test.sh --verbose
   tags:
     - rust-test

js/scripts/install-deps.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# change into the js directory (one down from scripts)
+pushd `dirname $0`
+cd ..
+
+# install deps and store the exit code
+npm install
+EXICCODE=$?
+
+# back to root
+popd
+
+# exit with exit code
+exit $EXITCODE

js/scripts/test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# change into the js directory (one down from scripts)
+pushd `dirname $0`
+cd ..
+
+# run lint & tests and store the exit code
+npm run lint && npm run test
+EXICCODE=$?
+
+# back to root
+popd
+
+# exit with exit code
+exit $EXITCODE

js/src/api/transport/ws/ws.js

@@ -32,7 +32,7 @@ export default class Ws extends JsonRpcBase {
 
   _onMessage = (event) => {
     const result = JSON.parse(event.data);
-    const {resolve, reject} = this._messages[result.id];
+    const { resolve, reject } = this._messages[result.id];
 
     if (result.error) {
       this.error(event.data);

js/src/dapps/registry.js

@@ -25,10 +25,8 @@ import './style.css';
 import './registry.html';
 
 ReactDOM.render(
-  (
-    <Provider store={ store }>
-      <Container />
-    </Provider>
-  ),
+  <Provider store={ store }>
+    <Container />
+  </Provider>,
   document.querySelector('#container')
 );

js/src/dapps/registry/Application/application.js

@@ -33,7 +33,9 @@ export default class Application extends Component {
 }
 
 Application.propTypes = {
+  actions: PropTypes.object,
   contract: PropTypes.object,
   fee: PropTypes.object,
+  lookup: PropTypes.object,
   owner: PropTypes.string
 };

js/src/dapps/registry/Lookup/reducers.js

@@ -5,26 +5,29 @@ const initialState = {
 };
 
 export default (state = initialState, action) => {
-  if (action.type === 'lookup start')
+  if (action.type === 'lookup start') {
     return {
       pending: true,
       name: action.name, key: action.key,
       result: null
     };
+  }
 
-  if (action.type === 'lookup error')
+  if (action.type === 'lookup error') {
     return {
       pending: false,
       name: null, key: null,
       result: null
     };
+  }
 
-  if (action.type === 'lookup success')
+  if (action.type === 'lookup success') {
     return {
       pending: false,
       name: null, key: null,
       result: action.result
     };
+  }
 
   return state;
 };

js/src/dapps/registry/reducers.js

@@ -8,14 +8,17 @@ const initialState = {
 };
 
 export default (state = initialState, action) => {
-  if (action.type === 'set contract')
+  if (action.type === 'set contract') {
     return { ...state, contract: action.contract };
+  }
 
-  if (action.type === 'set fee')
+  if (action.type === 'set fee') {
     return { ...state, fee: action.fee };
+  }
 
-  if (action.type === 'set owner')
+  if (action.type === 'set owner') {
     return { ...state, owner: action.owner };
+  }
 
   if (action.type.slice(0, 6) === 'lookup') {
     return { ...state, lookup: lookupReducer(state.lookup, action) };