Skip to content

Commit

Permalink
Merge pull request #21 from lifechurch/cm/adds_ci
Browse files Browse the repository at this point in the history
Cm/adds ci
  • Loading branch information
CodyMcMichael authored Sep 4, 2018
2 parents 68d47b6 + 9b88592 commit 76b7295
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 39 deletions.
37 changes: 21 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
language: ruby
language: node_js
node_js:
- "7"

script: echo "Running tests against $(node -v) ..."

install: "npm install"
stages:
- test
- name: deploy
if: branch = master
cache:
- bundler
- node_modules
# - name: npm release
# if: branch = master

before_script:
- bundle exec rake assets:precompile
cache:
directories:
- "node_modules"

test:
script: npm test
deploy:
provider: heroku
api_key:
secure: $HEROKU_AUTH_TOKEN
app: validstate
jobs:
include:
- stage: test
name: "Unit Tests"
script: npm test
# Save for later in case we want to add this in
# - stage: npm release
# script: echo "Building distrubtion ..." && npm build
# script: echo "Deploying to npm ..."
# deploy:
# provider: npm
# api_key: "$NPM_API_KEY"
# on:
# tags: true
# skip_cleanup: true
46 changes: 23 additions & 23 deletions tests/Validstate.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ beforeAll(() => {
Validstate.init(validationConfig, store);
actual = store.getState().validstate.account;
expected = {
"email": {"message": null, "reason": null, "valid": null},
"name": {
"firstname": {"message": null, "reason": null, "valid": null},
"email": {"message": null, "reason": null, "valid": null},
"name": {
"firstname": {"message": null, "reason": null, "valid": null},
"lastname": {
"maidenName": {"message": null, "reason": null, "valid": null}, "message": null, "reason": null,
"surname": {"message": null, "reason": null, "valid": null}, "valid": null},
"message": null, "reason": null, "valid": null},
"password": {"message": null, "reason": null,
"token": {"message": null, "reason": null, "valid": null},
"valid": null},
"maidenName": {"message": null, "reason": null, "valid": null}, "message": null, "reason": null,
"surname": {"message": null, "reason": null, "valid": null}, "valid": null},
"message": null, "reason": null, "valid": null},
"password": {"message": null, "reason": null,
"token": {"message": null, "reason": null, "valid": null},
"valid": null},
"valid": null
}
});
Expand Down Expand Up @@ -50,16 +50,16 @@ describe('Validstate', () => {
// TODO change this whenever messages are extended into nested properties.
// Currently if a property is nested then the parent property will have null values except for `valid`
expected = {
"email": {"message": "Email must be formatted as an email.", "reason": "email", "valid": false},
"name": {
"firstname": {"message": null, "reason": "required", "valid": false},
"email": {"message": "Email must be formatted as an email.", "reason": "email", "valid": false},
"name": {
"firstname": {"message": null, "reason": "required", "valid": false},
"message": null, "reason": null, "valid": false
},
},
"password": {
"message": null, "reason": null,
"token": {"message": null, "reason": "minLength", "valid": false},
"message": null, "reason": null,
"token": {"message": null, "reason": "minLength", "valid": false},
"valid": false
},
},
"valid": false
}
});
Expand All @@ -86,16 +86,16 @@ describe('Validstate', () => {
Validstate.validate('account');

expected = {
"email": {"message": null, "reason": null, "valid": true},
"name": {
"firstname": {"message": null, "reason": null, "valid": true},
"email": {"message": null, "reason": null, "valid": true},
"name": {
"firstname": {"message": null, "reason": null, "valid": true},
"message": null, "reason": null, "valid": true
},
},
"password": {
"message": null, "reason": null,
"token": {"message": null, "reason": null, "valid": true},
"message": null, "reason": null,
"token": {"message": null, "reason": null, "valid": true},
"valid": true
},
},
"valid": true
}
});
Expand Down

0 comments on commit 76b7295

Please sign in to comment.