Merge 9143346 into 94d73f3

thewca · Sep 10, 2020 · abf9bb5 · abf9bb5
2 parents 94d73f3 + 9143346
commit abf9bb5
Show file tree

Hide file tree

Showing 10 changed files with 687 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,18 @@
-language: java
-jdk: openjdk8
-sudo: true
+jobs:
+    include:
+        - language: java
+          jdk: openjdk8
+          sudo: true
+          script:
+              - ./gradlew assemble
+              - ./gradlew check
+              - ./gradlew buildOfficial
 
-script:
-  - ./gradlew assemble
-  - ./gradlew check
-  - ./gradlew buildOfficial
+        - language: node_js
+          node_js: 10
+          script:
+              - cd tnoodle-ui
+              - npm install
+              - npm test -- --coverage
+          after_script:
+              - COVERALLS_REPO_TOKEN=$coveralls_repo_token npm run coveralls
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 TNoodle is a software suite that contains the official WCA scramble program. It consists of the core scrambling code (primarily written in Java) as well as a UI and server to generate a fully autonomous JAR file
 
-[![Build Status](https://travis-ci.org/thewca/tnoodle.svg?branch=master)](https://travis-ci.org/thewca/tnoodle)
+[![Build Status](https://travis-ci.org/thewca/tnoodle.svg?branch=master)](https://travis-ci.org/thewca/tnoodle) [![Coverage Status](https://coveralls.io/repos/github/thewca/tnoodle/badge.svg?branch=master)](https://coveralls.io/github/thewca/tnoodle?branch=master)
 
 ## WCA Scramble Program
 

diff --git a/tnoodle-ui/package.json b/tnoodle-ui/package.json
@@ -1,46 +1,48 @@
 {
-  "name": "tnoodle-ui",
-  "version": "0.1.0",
-  "private": true,
-  "homepage": "http://localhost:2014/scramble",
-  "proxy": "http://localhost:2014",
-  "dependencies": {
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
-    "@testing-library/user-event": "^7.1.2",
-    "bootstrap": "^4.4.1",
-    "fetch-intercept": "^2.3.1",
-    "node-sass": "^4.13.1",
-    "react": "^16.12.0",
-    "react-bootstrap": "^1.0.0-beta.16",
-    "react-dom": "^16.12.0",
-    "react-icons": "^3.10.0",
-    "react-redux": "^7.1.3",
-    "react-router-dom": "^5.1.2",
-    "react-scripts": "3.4.3",
-    "redux": "^4.0.5"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --watchAll --watchAll=false",
-    "eject": "react-scripts eject",
-    "predeploy": "npm run build",
-    "deploy": "gh-pages -d build"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
+    "name": "tnoodle-ui",
+    "version": "0.1.0",
+    "private": true,
+    "homepage": "http://localhost:2014/scramble",
+    "proxy": "http://localhost:2014",
+    "dependencies": {
+        "@testing-library/jest-dom": "^4.2.4",
+        "@testing-library/react": "^9.3.2",
+        "@testing-library/user-event": "^7.1.2",
+        "bootstrap": "^4.4.1",
+        "fetch-intercept": "^2.3.1",
+        "node-sass": "^4.13.1",
+        "react": "^16.12.0",
+        "react-bootstrap": "^1.0.0-beta.16",
+        "react-dom": "^16.12.0",
+        "react-icons": "^3.10.0",
+        "react-redux": "^7.1.3",
+        "react-router-dom": "^5.1.2",
+        "react-scripts": "3.4.3",
+        "redux": "^4.0.5"
+    },
+    "eslintConfig": {
+        "extends": "react-app"
+    },
+    "scripts": {
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test --watchAll --watchAll=false",
+        "eject": "react-scripts eject",
+        "coveralls": "cat ./coverage/lcov.info | node node_modules/.bin/coveralls"
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    },
+    "devDependencies": {
+        "coveralls": "^3.1.0"
+    }
 }
diff --git a/tnoodle-ui/src/components/EventPickerTable.jsx b/tnoodle-ui/src/components/EventPickerTable.jsx
@@ -36,11 +36,11 @@ const EventPickerTable = connect(
     mapDispatchToProps
 )(
     class extends Component {
-        componentDidMount = function () {
+        componentDidMount() {
             this.getFormats();
             this.getWcaEvents();
             this.getFmcTranslations();
-        };
+        }
 
         getFormats = () => {
             fetchFormats()
@@ -49,8 +49,8 @@ const EventPickerTable = connect(
                         return response.json();
                     }
                 })
-                .then((formats) => {
-                    this.props.setWcaFormats(formats);
+                .then((response) => {
+                    this.props.setWcaFormats(response);
                 });
         };
 
@@ -61,8 +61,8 @@ const EventPickerTable = connect(
                         return response.json();
                     }
                 })
-                .then((wcaEvents) => {
-                    this.props.setWcaEvents(wcaEvents);
+                .then((response) => {
+                    this.props.setWcaEvents(response);
                 });
         };
 

diff --git a/tnoodle-ui/src/components/FmcTranslationsDetail.jsx b/tnoodle-ui/src/components/FmcTranslationsDetail.jsx
@@ -141,18 +141,23 @@ const FmcTranslationsDetail = connect(
                                                                         checked={
                                                                             translation.status
                                                                         }
-                                                                        onChange={(e) =>
+                                                                        onChange={(
+                                                                            e
+                                                                        ) =>
                                                                             this.handleTranslation(
-                                                                                translation.id, e.target.checked
+                                                                                translation.id,
+                                                                                e
+                                                                                    .target
+                                                                                    .checked
                                                                             )
                                                                         }
                                                                     />
                                                                 </th>
                                                                 {j <
                                                                     TRANSLATIONS_PER_LINE -
-                                                                    1 && (
-                                                                        <th />
-                                                                    )}
+                                                                        1 && (
+                                                                    <th />
+                                                                )}
                                                             </React.Fragment>
                                                         );
                                                     }