Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ddce2b9
decrease timeouts to detect regressions faster in future
PieterGit Sep 14, 2017
2676cee
Admintools and profileeditor test fails with 20 sec timeout. Increasi…
PieterGit Sep 14, 2017
2caa67d
optimize travis tests. see if 5 sec per test is enough (in stead of 5…
PieterGit Sep 14, 2017
ec06d5d
the following tests don't complete in 5 sec. increase timeout to 25 sec.
PieterGit Sep 14, 2017
2cadcb0
increase profileeditor tests to 40 sec
PieterGit Sep 14, 2017
2f46e05
hasauth.test.js fails with 25 sec. increasing to 40 sec
PieterGit Sep 14, 2017
9fce5db
Merge pull request #2812 from nightscout/dev
sulkaharo Sep 22, 2017
6adb76e
Fixes hourly filtering in distrubution reports, reported in #2864
sulkaharo Sep 28, 2017
e31cbb4
SVG dimension fix
unsoluble-test Oct 6, 2017
f28c3f9
preserve original treatment collection
MilosKozak Oct 7, 2017
4e1837d
Remove pattern regex from basal change field
unsoluble-test Oct 9, 2017
d6a0b10
Use lodash cloneDeep instead of JSON serialize/desearialize
sulkaharo Oct 11, 2017
18e7b35
update Russian
apanasef Oct 12, 2017
1ffa0b5
Merge pull request #2913 from apanasef/patch-19
sulkaharo Oct 13, 2017
4e2e871
Merge pull request #2894 from unsoluble/SVG-dimension-fix
sulkaharo Oct 13, 2017
16f55bc
Merge pull request #2904 from unsoluble/Allow-negative-values-in-CP
sulkaharo Oct 13, 2017
06774d7
Merge pull request #2911 from nightscout/fixv2apiv2
sulkaharo Oct 14, 2017
7e662ac
Cleanup: move cache buster token generation to /bin, remove /scripts
sulkaharo Oct 15, 2017
48c8e7e
Fix express-minify file cache path to reduce the memory footprint of …
sulkaharo Oct 15, 2017
3ab41ce
Display RSSI on Loop pill
sulkaharo Oct 15, 2017
94cd87f
Add missing fontello icons to main CSS
sulkaharo Oct 15, 2017
1f0b3ef
Update version to release
sulkaharo Oct 15, 2017
486f6c3
Merge branch 'master' into dev
sulkaharo Oct 15, 2017
42a3a65
Loop RSSI fix
sulkaharo Oct 15, 2017
703a30d
One more Loop RSSI fix
sulkaharo Oct 15, 2017
c99570f
Always show RSSI
sulkaharo Oct 15, 2017
9f7de63
Merge pull request #2918 from nightscout/dev
sulkaharo Oct 15, 2017
1c387b8
Update dev version to 0.10.2
sulkaharo Oct 15, 2017
68af094
Adding some test coverage for /lib/client/renderer.js
christopher-fredregill Oct 15, 2017
f13b6af
send foods via websockets
MilosKozak Oct 16, 2017
3457de5
use websockeets instead of rest api for food
MilosKozak Oct 16, 2017
257371f
add fat,protein,energy to food editor
MilosKozak Oct 16, 2017
94d21d2
Re-enable source maps
sulkaharo Oct 16, 2017
0d90008
Merge pull request #2924 from MilosKozak/dev
MilosKozak Oct 16, 2017
532d766
handle AAPS profile switches well
MilosKozak Oct 20, 2017
ddfd790
Merge pull request #2960 from MilosKozak/dev
MilosKozak Oct 20, 2017
de2ff49
Merge pull request #2920 from christopher-fredregill/wip/increase_cov…
sulkaharo Oct 20, 2017
62f352c
update nodejs to 8.7.0 and npm update
PieterGit Oct 21, 2017
3995a26
do not upload temporary profiles from store
MilosKozak Oct 21, 2017
0c4ce20
Merge pull request #2968 from MilosKozak/dev
MilosKozak Oct 21, 2017
45d4853
Merge branch '201710_node870' of https://github.com/PieterGit/cgm-rem…
PieterGit Oct 21, 2017
64913d3
also update nodjes used by travis from 8.5.0 to 8.7.0
PieterGit Oct 21, 2017
43d6797
Upgrade travis node. Merge branch '201710_node870' of https://github.…
PieterGit Oct 21, 2017
2b5c660
Increase timeout for careportal.test.js and pluginbase.test from 25 t…
PieterGit Oct 21, 2017
c0388ab
increase timeout of admintools.test.js from 25 to 30 seconds
PieterGit Oct 21, 2017
cbee7f2
pluginbase.test.js fails with 30 sec. upping to 40 sec timeout
PieterGit Oct 22, 2017
f51a24f
update to nodejs 8.8.0 and npm update
PieterGit Oct 25, 2017
ccda13e
Update to node js 8.8.0 and npm update. Merge branch '201710_node870'…
PieterGit Oct 25, 2017
68536d9
npm update with nodejs 8.8.0
PieterGit Oct 25, 2017
ca7972a
Merge pull request #2967 from PieterGit/201710_node870
sulkaharo Oct 25, 2017
c6af0aa
Merge pull request #2800 from PieterGit/travis_improve
sulkaharo Oct 25, 2017
a869e3c
Update version, remove package-lock.json
sulkaharo Oct 25, 2017
dd1cc9c
upgrade node in .nvmrc from 8.1.4 to 8.8.0
PieterGit Oct 25, 2017
9c403e5
set sudo back to required (used for docker and mongodb commands)
PieterGit Oct 25, 2017
9b77bc5
Merge pull request #2982 from PieterGit/travis_fix
sulkaharo Oct 25, 2017
9c971f0
more node upgrade stuff
PieterGit Oct 25, 2017
56092f3
Update README.md
sulkaharo Oct 25, 2017
1e20d83
Merge pull request #2983 from PieterGit/travis_fix2
sulkaharo Oct 25, 2017
f6f5549
Fix a bug with time comparison on if-modified-since support for treat…
sulkaharo Oct 25, 2017
0efaffa
Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into dev
sulkaharo Oct 25, 2017
c16ad7b
Check both created_at and timestamp fields for treatments in if-modif…
sulkaharo Oct 25, 2017
dd5c125
Bump 8.8.0 to 8.8.1
sulkaharo Oct 26, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ all: test

coverage:
NODE_ENV=test ${MONGO_SETTINGS} \
${ISTANBUL} cover ${MOCHA} -- --timeout 30000 -R tap ${TESTS}
${ISTANBUL} cover ${MOCHA} -- --timeout 15000 -R tap ${TESTS}

report:
test -f ${ANALYZED} && \
Expand All @@ -45,7 +45,7 @@ test:

travis:
NODE_ENV=test ${MONGO_SETTINGS} \
${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 50000 -R tap ${TESTS}
${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 5000 -R tap ${TESTS}

docker_release:
# Get the version from the package.json file
Expand Down
51 changes: 37 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/admintools.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var someData = {

describe('admintools', function ( ) {
var self = this;
this.timeout(30000);
this.timeout(30000); // TODO: see why this test takes longer on Travis to complete
before(function (done) {
benv.setup(function() {

Expand Down
2 changes: 2 additions & 0 deletions tests/careportal.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ var nowData = {
};

describe('client', function ( ) {
this.timeout(30000); // TODO: see why this test takes longer on Travis to complete

var self = this;

var headless = require('./fixtures/headless')(benv, this);
Expand Down
7 changes: 2 additions & 5 deletions tests/hashauth.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ var read = require('fs').readFileSync;
var serverSettings = require('./fixtures/default-server-settings');

describe('hashauth', function ( ) {
this.timeout(40000); // TODO: see why this test takes longer on Travis to complete

var self = this;
var headless = require('./fixtures/headless')(benv, this);

Expand Down Expand Up @@ -63,7 +65,6 @@ describe('hashauth', function ( ) {
*/

it ('should make module unauthorized', function () {
this.timeout(50000);
var client = require('../lib/client');
var hashauth = require('../lib/hashauth');

Expand All @@ -82,7 +83,6 @@ describe('hashauth', function ( ) {
});

it ('should make module authorized', function () {
this.timeout(50000);
var client = require('../lib/client');
var hashauth = require('../lib/hashauth');

Expand All @@ -99,9 +99,6 @@ describe('hashauth', function ( ) {
});

it ('should store hash and the remove authentication', function () {

this.timeout(50000);

var client = require('../lib/client');
var hashauth = require('../lib/hashauth');
var localStorage = require('./fixtures/localstorage');
Expand Down
2 changes: 2 additions & 0 deletions tests/pluginbase.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ require('should');
var benv = require('benv');

describe('pluginbase', function ( ) {
this.timeout(40000); // TODO: see why this test takes longer on Travis to complete

var headless = require('./fixtures/headless')(benv, this);

before(function (done) {
Expand Down
2 changes: 1 addition & 1 deletion tests/profileeditor.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var someData = {


describe('Profile editor', function ( ) {
this.timeout(30000);
this.timeout(40000); //TODO: see why this test takes longer on Travis to complete
var headless = require('./fixtures/headless')(benv, this);

before(function (done) {
Expand Down