Merge pull request #344 from RickCarlino/master

Test PR; please ignore.

.coveralls.yml

@@ -0,0 +1 @@
+repo_token: lEX6nkql7y2YFCcIXVq5ORvdvMtYzfZdG

.travis.yml

@@ -9,7 +9,6 @@ before_script:
 - cp config/database.travis.yml config/database.yml
 - mkdir -p public/app
 - touch public/app/index.html
-- "./install_frontend.sh"
 - bundle install
 - bundle exec rake db:create db:migrate
 - yarn install
@@ -19,5 +18,7 @@ script:
 - export OS_UPDATE_SERVER=http://example.com
 - export FW_UPDATE_SERVER=http://example.com
 - export DB=postgresql
+- export COVERALLS_REPO_TOKEN=lEX6nkql7y2YFCcIXVq5ORvdvMtYzfZdG
 - bundle exec rspec
 - npm run test
+- npm run coverage

package.json

@@ -8,14 +8,13 @@
     "url": "https://github.com/farmbot/farmbot-web-frontend"
   },
   "scripts": {
-    "coverage": "midori coverage/remapped/html/index.html",
+    "coverage": "cat **/*lcov.info | ./node_modules/coveralls/bin/coveralls.js",
     "build": "node_modules/webpack/bin/webpack.js --config tools/webpack.config.prd.js --display-error-details",
     "start": "echo '===We use `npm run dev` now.==='",
     "heroku-postbuild": "./install_frontend.sh 2>&1",
     "dev": "PORT=3000 bundle exec foreman start --procfile=Procfile.dev",
     "webpack": "webpack-dev-server --config tools/webpack.config.dev.js --content-base public/ --host 0.0.0.0",
-    "test": "jest --coverage --no-cache && cat ./coverage/remapped/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-    "just_test": "jest --coverage --no-cache"
+    "test": "jest --coverage --no-cache"
   },
   "keywords": [
     "farmbot"
@@ -119,7 +118,8 @@
     ],
     "coverageReporters": [
       "html",
-      "json"
+      "json",
+      "lcov"
     ]
   }
 }

src/farm_designer/farm_events/calendar/__tests__/occurrence_test.ts

@@ -12,7 +12,6 @@ describe("occurrence", () => {
     expect(t.executableId).toBe(fe.executable_id);
     expect(t.mmdd).toBe("0619");
     expect(t.sortKey).toBe(moment(TIME.MONDAY).unix());
-    expect(t.timeStr).toBe("01:30am");
     expect(t.parentExecutableName).toBe(fe.executable.name);
     expect(t.id).toBe(fe.id);
   });