Commit Graph

1208 Commits

Author SHA1 Message Date
Michael Teeuw 677e93430d Merge pull request #675 from roramirez/run-travis-all-tests
Run tests e2e in Travis
2017-02-01 07:45:50 +01:00
Michael Teeuw a9a90c5545 Merge pull request #676 from roramirez/hotfix/MM_PORT
hotfix PL #673
2017-02-01 07:45:28 +01:00
Rodrigo Ramírez Norambuena ee0418e719 hotfix PL #673 2017-01-31 22:08:38 -03:00
Rodrigo Ramírez Norambuena 6fc1141477 Run tests e2e in Travis 2017-01-31 18:38:25 -03:00
Michael Teeuw b02920c43c Merge pull request #674 from morozgrafix/test_branch
Restructured Test Suite
2017-01-31 21:52:53 +01:00
Michael Teeuw 049d249609 Merge pull request #673 from bastilimbach/feature/docker
Added Docker support for server only mode
2017-01-31 21:51:58 +01:00
Sergey Morozov fc2a554415 fix for 12hr regex
thanks to @roramirez for testing and catching it.
2017-01-31 12:24:11 -08:00
Sebastian Limbach 42b806b500 Fixed whitespace 2017-01-31 21:19:37 +01:00
Sergey Morozov 86fdd91597 Restructured Test Suite
- separated tests into e2e and unit directories
- created configs directory structure to support test framework
- added/modified `npm run test`, `npm run test:unit` and `npm run test:e2e` to target all, unit and e2e tests respectively
- modified some of the test names to be more descriptive

New structure of the Test Suite has following directory tree:

```
tests
├── configs
│   ├── env.js
│   └── modules
│       ├── clock
│       │   ├── clock_12hr.js
│       │   ├── clock_24hr.js
│       │   └── clock_showPeriodUpper.js
│       └── helloworld
│           └── helloworld.js
├── e2e
│   ├── env_spec.js
│   └── modules
│       ├── clock_spec.js
│       └── helloworld_spec.js
└── unit
    ├── functions
    │   └── cmp_versions_spec.js
    └── global_vars
        └── root_path_spec.js
```
2017-01-31 11:08:53 -08:00
Sebastian Limbach e68fea185d Merge branch 'develop' into feature/docker 2017-01-31 19:48:38 +01:00
Sebastian Limbach a3eaf9f473 Fixed typos and some description changes 2017-01-31 19:41:42 +01:00
Sebastian Limbach e6a2b9f06e Added the Docker support changes to changelog 2017-01-31 19:40:49 +01:00
Sebastian Limbach a78973702b Added Docker install documentation 2017-01-31 16:36:01 +01:00
Sebastian Limbach 354b745c39 Added Docker support 2017-01-31 11:41:40 +01:00
Michael Teeuw ce6cd6acdc Merge pull request #670 from roramirez/translation-check
Translation check
2017-01-31 08:44:10 +01:00
Michael Teeuw 8e129143f1 Merge pull request #671 from Nosrac/develop
Support calendar-specific maximumEntries and maximumNumberOfDays
2017-01-31 08:42:50 +01:00
Michael Teeuw 6d50cbba6f Merge pull request #672 from morozgrafix/test_branch
Add missing 'chai-as-promised' dependency
2017-01-31 08:41:54 +01:00
Sergey Morozov 7731878f36 Add missing 'chai-as-promised' dependency
When I attempted to run e2e tests I got following error:

```
$npm run test:e2e

> magicmirror@2.1.1 test:e2e /Users/sergeym/localDev/MagicMirror
> ./node_modules/mocha/bin/mocha tests/e2e --recursive

module.js:471
    throw err;
    ^

Error: Cannot find module 'chai-as-promised'
...
```

Adding `chai-as-promised` to `package.json` and running npm install fixes it.
2017-01-30 15:33:23 -08:00
Kyle Carson 9f659eef1b Fix formatting 2017-01-30 16:35:21 -06:00
Kyle Carson 14cc642e54 Support calendar-specific maximumEntries and maximumNumberOfDays 2017-01-30 16:26:42 -06:00
Michael Teeuw c47852cd0a Merge pull request #661 from artifactdev/master
Color options for calendar and weather forecast
2017-01-30 20:56:34 +01:00
Michael Teeuw c3bfaa31ee Merge branch 'develop' into master 2017-01-30 20:55:53 +01:00
Michael Teeuw 832505a315 Merge pull request #669 from roramirez/test-e2e
Test e2e
2017-01-30 20:55:25 +01:00
Rodrigo Ramírez Norambuena cb71667336 Use jsonlint task to check translation files 2017-01-30 13:36:22 -03:00
Rodrigo Ramírez Norambuena 1032e97d58 Fix string russian translation module alert 2017-01-30 13:32:52 -03:00
Rodrigo Ramírez Norambuena b4271da13e add translations/translations.js eslint check 2017-01-30 13:17:36 -03:00
Rodrigo Ramírez Norambuena e2dc5ef4f2 fix eslint change single quote by double quote 2017-01-30 12:46:21 -03:00
Rodrigo Ramírez Norambuena c75ee042a8 add e2e test enviroment 2017-01-30 12:36:11 -03:00
Rodrigo Ramírez Norambuena d474d518ca test e2e module helloworld 2017-01-30 12:24:49 -03:00
Rodrigo Ramírez Norambuena 52b8dbcbb1 separate test type. Create directory for End-to-end testing. 2017-01-30 12:17:45 -03:00
Rodrigo Ramírez Norambuena 0d8d8f0426 Add tests configs directory as express route. 2017-01-30 12:17:23 -03:00
artifactdev ed12deae25 Update CHANGELOG.md
Added color options for calendar and weather forecast to changelog
2017-01-30 13:17:44 +01:00
Michael Teeuw 7f1e7c981d Merge pull request #666 from roramirez/index-mm-config-file-env-var
Use configuration file in index.html when is set MM_CONFIG_FILE
2017-01-30 12:53:44 +01:00
Michael Teeuw cc26688d82 Merge pull request #668 from Jopyth/patch-4
missing comma in sv.json translation
2017-01-30 12:52:31 +01:00
Jopyth a0fa3a6063 missing comma in sv.json translation 2017-01-30 09:28:37 +01:00
Rodrigo Ramírez Norambuena 110a1a640d fix .stylelintrc in jsonlint check 2017-01-29 17:15:01 -03:00
Rodrigo Ramírez Norambuena bbdc43c750 Use configuration file in index.html when is set MM_CONFIG_FILE 2017-01-29 17:00:56 -03:00
Michael Teeuw c73b9b4882 Merge pull request #663 from Snille/develop
Added and translated some missing strings in the sv.json file.
2017-01-29 11:39:47 +01:00
Jeremias Arnstadt e249092f91 used mardown in calendar README 2017-01-29 11:17:00 +01:00
Jeremias Arnstadt 5c0b04bfc8 fixed linting issues 2017-01-29 00:59:38 +01:00
Jeremias Arnstadt bc257f4951 Merge branch 'develop' of https://github.com/artifactdev/MagicMirror
# Conflicts:
#	modules/default/calendar/README.md
#	modules/default/weatherforecast/README.md
2017-01-29 00:53:07 +01:00
Erik Pettersson e738ee0812 Added information about the sv.json update. 2017-01-29 00:09:51 +01:00
snille ebb2db17f3 Fixed the Swedish translation. 2017-01-29 00:06:06 +01:00
Jeremias Arnstadt 4214293b76 updated README of weatherforecast and calendar module for color options 2017-01-28 18:32:06 +01:00
Jeremias Arnstadt ce3ee909bf added possibility to give each calendar another color 2017-01-28 18:21:02 +01:00
Jeremias Arnstadt 09ba1e2470 added possibility to color max and min temprature 2017-01-28 18:01:37 +01:00
Michael Teeuw 68444b81cc Merge pull request #659 from Jopyth/patch-hidden-status
fix module hidden status
2017-01-28 13:44:49 +01:00
Joseph Bethge d3c0b9a438 fix module hidden status 2017-01-28 12:31:33 +01:00
Michael Teeuw 6e2f1f72c6 Merge pull request #657 from roramirez/splashscreen-halt-reboot
Show splash screen image on reboot and halt.
2017-01-28 06:21:25 +01:00
Michael Teeuw c82eec09b7 Merge pull request #658 from roramirez/fix-validate-file-config-by-variable
Fix bug validation when is not set MM_CONFIG_FILE enviroment variable
2017-01-28 06:20:23 +01:00