From cc7780773176fecb2bfdd6a8832cdf0b6ea4c114 Mon Sep 17 00:00:00 2001 From: Ruben Verborgh Date: Fri, 11 Aug 2017 14:28:48 -0400 Subject: [PATCH 1/3] Follow Mocha naming conventions. End tests in -test. --- package.json | 21 ++++++++++--------- ...-oidc.js => account-creation-oidc-test.js} | 2 +- ...on-tls.js => account-creation-tls-test.js} | 2 +- ...unt-manager.js => account-manager-test.js} | 0 ...t-template.js => account-template-test.js} | 0 .../{acl-oidc.js => acl-oidc-test.js} | 2 +- .../{acl-tls.js => acl-tls-test.js} | 8 +++---- .../{auth-proxy.js => auth-proxy-test.js} | 2 +- ...on-oidc.js => authentication-oidc-test.js} | 0 ...covery.js => capability-discovery-test.js} | 0 .../{cors-proxy.js => cors-proxy-test.js} | 0 .../{errors-oidc.js => errors-oidc-test.js} | 0 .../integration/{errors.js => errors-test.js} | 8 +++---- .../{formats.js => formats-test.js} | 0 .../{http-copy.js => http-copy-test.js} | 2 +- test/integration/{http.js => http-test.js} | 2 +- test/integration/{ldp.js => ldp-test.js} | 8 +++---- .../{oidc-manager.js => oidc-manager-test.js} | 0 .../integration/{params.js => params-test.js} | 8 +++---- .../{patch-2.js => patch-2-test.js} | 8 +++---- test/integration/{patch.js => patch-test.js} | 8 +++---- test/mocha.opts | 1 + .../emails/{welcome.js => welcome-test.js} | 0 ...unt-manager.js => account-manager-test.js} | 0 ...t-template.js => account-template-test.js} | 0 .../{acl-checker.js => acl-checker-test.js} | 0 ...rt-request.js => add-cert-request-test.js} | 0 ...auth-handlers.js => auth-handlers-test.js} | 0 .../{auth-proxy.js => auth-proxy-test.js} | 0 .../{auth-request.js => auth-request-test.js} | 0 ...authenticator.js => authenticator-test.js} | 0 ...uest.js => create-account-request-test.js} | 0 ...email-service.js => email-service-test.js} | 0 ...email-welcome.js => email-welcome-test.js} | 0 .../{error-pages.js => error-pages-test.js} | 0 .../{force-user.js => force-user-test.js} | 0 ...login-request.js => login-request-test.js} | 0 .../{oidc-manager.js => oidc-manager-test.js} | 0 ...ator.js => password-authenticator-test.js} | 0 ...est.js => password-change-request-test.js} | 0 ...s => password-reset-email-request-test.js} | 0 .../{solid-host.js => solid-host-test.js} | 0 ...enticator.js => tls-authenticator-test.js} | 0 ...token-service.js => token-service-test.js} | 0 .../{user-account.js => user-account-test.js} | 0 ...ounts-api.js => user-accounts-api-test.js} | 0 test/unit/{utils.js => utils-test.js} | 0 test/{test-utils.js => utils.js} | 0 48 files changed, 42 insertions(+), 40 deletions(-) rename test/integration/{account-creation-oidc.js => account-creation-oidc-test.js} (99%) rename test/integration/{account-creation-tls.js => account-creation-tls-test.js} (99%) rename test/integration/{account-manager.js => account-manager-test.js} (100%) rename test/integration/{account-template.js => account-template-test.js} (100%) rename test/integration/{acl-oidc.js => acl-oidc-test.js} (99%) rename test/integration/{acl-tls.js => acl-tls-test.js} (99%) rename test/integration/{auth-proxy.js => auth-proxy-test.js} (97%) rename test/integration/{authentication-oidc.js => authentication-oidc-test.js} (100%) rename test/integration/{capability-discovery.js => capability-discovery-test.js} (100%) rename test/integration/{cors-proxy.js => cors-proxy-test.js} (100%) rename test/integration/{errors-oidc.js => errors-oidc-test.js} (100%) rename test/integration/{errors.js => errors-test.js} (89%) rename test/integration/{formats.js => formats-test.js} (100%) rename test/integration/{http-copy.js => http-copy-test.js} (98%) rename test/integration/{http.js => http-test.js} (99%) rename test/integration/{ldp.js => ldp-test.js} (98%) rename test/integration/{oidc-manager.js => oidc-manager-test.js} (100%) rename test/integration/{params.js => params-test.js} (96%) rename test/integration/{patch-2.js => patch-2-test.js} (97%) rename test/integration/{patch.js => patch-test.js} (97%) rename test/resources/accounts-acl/config/templates/emails/{welcome.js => welcome-test.js} (100%) rename test/unit/{account-manager.js => account-manager-test.js} (100%) rename test/unit/{account-template.js => account-template-test.js} (100%) rename test/unit/{acl-checker.js => acl-checker-test.js} (100%) rename test/unit/{add-cert-request.js => add-cert-request-test.js} (100%) rename test/unit/{auth-handlers.js => auth-handlers-test.js} (100%) rename test/unit/{auth-proxy.js => auth-proxy-test.js} (100%) rename test/unit/{auth-request.js => auth-request-test.js} (100%) rename test/unit/{authenticator.js => authenticator-test.js} (100%) rename test/unit/{create-account-request.js => create-account-request-test.js} (100%) rename test/unit/{email-service.js => email-service-test.js} (100%) rename test/unit/{email-welcome.js => email-welcome-test.js} (100%) rename test/unit/{error-pages.js => error-pages-test.js} (100%) rename test/unit/{force-user.js => force-user-test.js} (100%) rename test/unit/{login-request.js => login-request-test.js} (100%) rename test/unit/{oidc-manager.js => oidc-manager-test.js} (100%) rename test/unit/{password-authenticator.js => password-authenticator-test.js} (100%) rename test/unit/{password-change-request.js => password-change-request-test.js} (100%) rename test/unit/{password-reset-email-request.js => password-reset-email-request-test.js} (100%) rename test/unit/{solid-host.js => solid-host-test.js} (100%) rename test/unit/{tls-authenticator.js => tls-authenticator-test.js} (100%) rename test/unit/{token-service.js => token-service-test.js} (100%) rename test/unit/{user-account.js => user-account-test.js} (100%) rename test/unit/{user-accounts-api.js => user-accounts-api-test.js} (100%) rename test/unit/{utils.js => utils-test.js} (100%) rename test/{test-utils.js => utils.js} (100%) diff --git a/package.json b/package.json index 0dd78e6ac..1630904fb 100644 --- a/package.json +++ b/package.json @@ -98,16 +98,17 @@ "scripts": { "solid": "node ./bin/solid", "standard": "standard", - "mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha ./test/**/*.js", - "test": "npm run standard && npm run mocha", - "test-integration": "mocha ./test/integration/*.js", - "test-unit": "mocha ./test/unit/*.js", - "test-debug": "DEBUG='solid:*' ./node_modules/mocha/bin/mocha ./test/*.js", - "test-acl": "./node_modules/mocha/bin/mocha ./test/acl.js", - "test-params": "./node_modules/mocha/bin/mocha ./test/params.js", - "test-http": "./node_modules/mocha/bin/mocha ./test/http.js", - "test-formats": "./node_modules/mocha/bin/mocha ./test/formats.js", - "test-errors": "./node_modules/mocha/bin/mocha ./test/errors.js", + "nyc": "NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha", + "mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 mocha", + "test": "npm run standard && npm run nyc", + "test-integration": "npm run mocha ./test/integration/**/*-test.js", + "test-unit": "npm run mocha ./test/unit/*.js", + "test-debug": "DEBUG='solid:*' npm run mocha", + "test-acl": "npm run mocha ./test/**/*acl*-test.js", + "test-params": "npm run mocha ./test/integration/params-test.js", + "test-http": "npm run mocha ./test/integration/http-test.js", + "test-formats": "npm run mocha ./test/integration/formats-test.js", + "test-errors": "npm run mocha ./test/integration/errors-test.js", "clean": "rm -rf config.json accounts profile inbox .acl settings .meta .meta.acl", "clean-account": "rm -rf accounts profile inbox .acl .meta settings .meta.acl" }, diff --git a/test/integration/account-creation-oidc.js b/test/integration/account-creation-oidc-test.js similarity index 99% rename from test/integration/account-creation-oidc.js rename to test/integration/account-creation-oidc-test.js index d4cbe66e5..34997fc03 100644 --- a/test/integration/account-creation-oidc.js +++ b/test/integration/account-creation-oidc-test.js @@ -2,7 +2,7 @@ const supertest = require('supertest') // Helper functions for the FS const $rdf = require('rdflib') -const { rm, read } = require('../test-utils') +const { rm, read } = require('../utils') const ldnode = require('../../index') const path = require('path') const fs = require('fs-extra') diff --git a/test/integration/account-creation-tls.js b/test/integration/account-creation-tls-test.js similarity index 99% rename from test/integration/account-creation-tls.js rename to test/integration/account-creation-tls-test.js index ea459579f..d345915d9 100644 --- a/test/integration/account-creation-tls.js +++ b/test/integration/account-creation-tls-test.js @@ -2,7 +2,7 @@ // // Helper functions for the FS // const $rdf = require('rdflib') // -// const { rm, read } = require('../test-utils') +// const { rm, read } = require('../utils') // const ldnode = require('../../index') // const fs = require('fs-extra') // const path = require('path') diff --git a/test/integration/account-manager.js b/test/integration/account-manager-test.js similarity index 100% rename from test/integration/account-manager.js rename to test/integration/account-manager-test.js diff --git a/test/integration/account-template.js b/test/integration/account-template-test.js similarity index 100% rename from test/integration/account-template.js rename to test/integration/account-template-test.js diff --git a/test/integration/acl-oidc.js b/test/integration/acl-oidc-test.js similarity index 99% rename from test/integration/acl-oidc.js rename to test/integration/acl-oidc-test.js index 060bfa8b0..23c8322d1 100644 --- a/test/integration/acl-oidc.js +++ b/test/integration/acl-oidc-test.js @@ -2,7 +2,7 @@ const assert = require('chai').assert const fs = require('fs-extra') const request = require('request') const path = require('path') -const rm = require('../test-utils').rm +const rm = require('../utils').rm const ldnode = require('../../index') diff --git a/test/integration/acl-tls.js b/test/integration/acl-tls-test.js similarity index 99% rename from test/integration/acl-tls.js rename to test/integration/acl-tls-test.js index fb3fc70a0..c5a49e861 100644 --- a/test/integration/acl-tls.js +++ b/test/integration/acl-tls-test.js @@ -10,10 +10,10 @@ var path = require('path') */ // Helper functions for the FS -var rm = require('../test-utils').rm -// var write = require('./test-utils').write -// var cp = require('./test-utils').cp -// var read = require('./test-utils').read +var rm = require('../utils').rm +// var write = require('./utils').write +// var cp = require('./utils').cp +// var read = require('./utils').read var ldnode = require('../../index') var ns = require('solid-namespace')($rdf) diff --git a/test/integration/auth-proxy.js b/test/integration/auth-proxy-test.js similarity index 97% rename from test/integration/auth-proxy.js rename to test/integration/auth-proxy-test.js index ccc88b68f..238696721 100644 --- a/test/integration/auth-proxy.js +++ b/test/integration/auth-proxy-test.js @@ -3,7 +3,7 @@ const path = require('path') const nock = require('nock') const request = require('supertest') const { expect } = require('chai') -const rm = require('../test-utils').rm +const rm = require('../utils').rm const HOST = 'solid.org' const USER = 'https://ruben.verborgh.org/profile/#me' diff --git a/test/integration/authentication-oidc.js b/test/integration/authentication-oidc-test.js similarity index 100% rename from test/integration/authentication-oidc.js rename to test/integration/authentication-oidc-test.js diff --git a/test/integration/capability-discovery.js b/test/integration/capability-discovery-test.js similarity index 100% rename from test/integration/capability-discovery.js rename to test/integration/capability-discovery-test.js diff --git a/test/integration/cors-proxy.js b/test/integration/cors-proxy-test.js similarity index 100% rename from test/integration/cors-proxy.js rename to test/integration/cors-proxy-test.js diff --git a/test/integration/errors-oidc.js b/test/integration/errors-oidc-test.js similarity index 100% rename from test/integration/errors-oidc.js rename to test/integration/errors-oidc-test.js diff --git a/test/integration/errors.js b/test/integration/errors-test.js similarity index 89% rename from test/integration/errors.js rename to test/integration/errors-test.js index eb67ccd5c..8b73d5e2f 100644 --- a/test/integration/errors.js +++ b/test/integration/errors-test.js @@ -2,10 +2,10 @@ var supertest = require('supertest') var path = require('path') // Helper functions for the FS -// var rm = require('./test-utils').rm -// var write = require('./test-utils').write -// var cp = require('./test-utils').cp -var read = require('./../test-utils').read +// var rm = require('./utils').rm +// var write = require('./utils').write +// var cp = require('./utils').cp +var read = require('./../utils').read var ldnode = require('../../index') diff --git a/test/integration/formats.js b/test/integration/formats-test.js similarity index 100% rename from test/integration/formats.js rename to test/integration/formats-test.js diff --git a/test/integration/http-copy.js b/test/integration/http-copy-test.js similarity index 98% rename from test/integration/http-copy.js rename to test/integration/http-copy-test.js index 5856bd43d..56d660a38 100644 --- a/test/integration/http-copy.js +++ b/test/integration/http-copy-test.js @@ -3,7 +3,7 @@ var fs = require('fs') var request = require('request') var path = require('path') // Helper functions for the FS -var rm = require('./../test-utils').rm +var rm = require('./../utils').rm var solidServer = require('../../index') diff --git a/test/integration/http.js b/test/integration/http-test.js similarity index 99% rename from test/integration/http.js rename to test/integration/http-test.js index c81e79167..bfcbcff52 100644 --- a/test/integration/http.js +++ b/test/integration/http-test.js @@ -2,7 +2,7 @@ var supertest = require('supertest') var fs = require('fs') var li = require('li') var ldnode = require('../../index') -var rm = require('./../test-utils').rm +var rm = require('./../utils').rm var path = require('path') const rdf = require('rdflib') diff --git a/test/integration/ldp.js b/test/integration/ldp-test.js similarity index 98% rename from test/integration/ldp.js rename to test/integration/ldp-test.js index de496a6a3..932f4656c 100644 --- a/test/integration/ldp.js +++ b/test/integration/ldp-test.js @@ -6,10 +6,10 @@ var path = require('path') var stringToStream = require('../../lib/utils').stringToStream // Helper functions for the FS -var rm = require('./../test-utils').rm -var write = require('./../test-utils').write -// var cp = require('./test-utils').cp -var read = require('./../test-utils').read +var rm = require('./../utils').rm +var write = require('./../utils').write +// var cp = require('./utils').cp +var read = require('./../utils').read var fs = require('fs') describe('LDP', function () { diff --git a/test/integration/oidc-manager.js b/test/integration/oidc-manager-test.js similarity index 100% rename from test/integration/oidc-manager.js rename to test/integration/oidc-manager-test.js diff --git a/test/integration/params.js b/test/integration/params-test.js similarity index 96% rename from test/integration/params.js rename to test/integration/params-test.js index 00c7f3e4d..71629b3a4 100644 --- a/test/integration/params.js +++ b/test/integration/params-test.js @@ -3,10 +3,10 @@ var supertest = require('supertest') var path = require('path') const fs = require('fs-extra') // Helper functions for the FS -var rm = require('../test-utils').rm -var write = require('../test-utils').write -// var cp = require('./test-utils').cp -var read = require('../test-utils').read +var rm = require('../utils').rm +var write = require('../utils').write +// var cp = require('./utils').cp +var read = require('../utils').read var ldnode = require('../../index') diff --git a/test/integration/patch-2.js b/test/integration/patch-2-test.js similarity index 97% rename from test/integration/patch-2.js rename to test/integration/patch-2-test.js index acfeb71cf..59842bb0d 100644 --- a/test/integration/patch-2.js +++ b/test/integration/patch-2-test.js @@ -4,10 +4,10 @@ var assert = require('chai').assert var path = require('path') // Helper functions for the FS -var rm = require('../test-utils').rm -var write = require('../test-utils').write -// var cp = require('./test-utils').cp -var read = require('../test-utils').read +var rm = require('../utils').rm +var write = require('../utils').write +// var cp = require('./utils').cp +var read = require('../utils').read describe('PATCH', function () { // Starting LDP diff --git a/test/integration/patch.js b/test/integration/patch-test.js similarity index 97% rename from test/integration/patch.js rename to test/integration/patch-test.js index c5247c799..440ba91d6 100644 --- a/test/integration/patch.js +++ b/test/integration/patch-test.js @@ -4,10 +4,10 @@ var assert = require('chai').assert var path = require('path') // Helper functions for the FS -var rm = require('../test-utils').rm -var write = require('../test-utils').write -// var cp = require('./test-utils').cp -var read = require('../test-utils').read +var rm = require('../utils').rm +var write = require('../utils').write +// var cp = require('./utils').cp +var read = require('../utils').read describe('PATCH', function () { // Starting LDP diff --git a/test/mocha.opts b/test/mocha.opts index 907011807..748f8d823 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -1 +1,2 @@ +--recursive --timeout 10000 diff --git a/test/resources/accounts-acl/config/templates/emails/welcome.js b/test/resources/accounts-acl/config/templates/emails/welcome-test.js similarity index 100% rename from test/resources/accounts-acl/config/templates/emails/welcome.js rename to test/resources/accounts-acl/config/templates/emails/welcome-test.js diff --git a/test/unit/account-manager.js b/test/unit/account-manager-test.js similarity index 100% rename from test/unit/account-manager.js rename to test/unit/account-manager-test.js diff --git a/test/unit/account-template.js b/test/unit/account-template-test.js similarity index 100% rename from test/unit/account-template.js rename to test/unit/account-template-test.js diff --git a/test/unit/acl-checker.js b/test/unit/acl-checker-test.js similarity index 100% rename from test/unit/acl-checker.js rename to test/unit/acl-checker-test.js diff --git a/test/unit/add-cert-request.js b/test/unit/add-cert-request-test.js similarity index 100% rename from test/unit/add-cert-request.js rename to test/unit/add-cert-request-test.js diff --git a/test/unit/auth-handlers.js b/test/unit/auth-handlers-test.js similarity index 100% rename from test/unit/auth-handlers.js rename to test/unit/auth-handlers-test.js diff --git a/test/unit/auth-proxy.js b/test/unit/auth-proxy-test.js similarity index 100% rename from test/unit/auth-proxy.js rename to test/unit/auth-proxy-test.js diff --git a/test/unit/auth-request.js b/test/unit/auth-request-test.js similarity index 100% rename from test/unit/auth-request.js rename to test/unit/auth-request-test.js diff --git a/test/unit/authenticator.js b/test/unit/authenticator-test.js similarity index 100% rename from test/unit/authenticator.js rename to test/unit/authenticator-test.js diff --git a/test/unit/create-account-request.js b/test/unit/create-account-request-test.js similarity index 100% rename from test/unit/create-account-request.js rename to test/unit/create-account-request-test.js diff --git a/test/unit/email-service.js b/test/unit/email-service-test.js similarity index 100% rename from test/unit/email-service.js rename to test/unit/email-service-test.js diff --git a/test/unit/email-welcome.js b/test/unit/email-welcome-test.js similarity index 100% rename from test/unit/email-welcome.js rename to test/unit/email-welcome-test.js diff --git a/test/unit/error-pages.js b/test/unit/error-pages-test.js similarity index 100% rename from test/unit/error-pages.js rename to test/unit/error-pages-test.js diff --git a/test/unit/force-user.js b/test/unit/force-user-test.js similarity index 100% rename from test/unit/force-user.js rename to test/unit/force-user-test.js diff --git a/test/unit/login-request.js b/test/unit/login-request-test.js similarity index 100% rename from test/unit/login-request.js rename to test/unit/login-request-test.js diff --git a/test/unit/oidc-manager.js b/test/unit/oidc-manager-test.js similarity index 100% rename from test/unit/oidc-manager.js rename to test/unit/oidc-manager-test.js diff --git a/test/unit/password-authenticator.js b/test/unit/password-authenticator-test.js similarity index 100% rename from test/unit/password-authenticator.js rename to test/unit/password-authenticator-test.js diff --git a/test/unit/password-change-request.js b/test/unit/password-change-request-test.js similarity index 100% rename from test/unit/password-change-request.js rename to test/unit/password-change-request-test.js diff --git a/test/unit/password-reset-email-request.js b/test/unit/password-reset-email-request-test.js similarity index 100% rename from test/unit/password-reset-email-request.js rename to test/unit/password-reset-email-request-test.js diff --git a/test/unit/solid-host.js b/test/unit/solid-host-test.js similarity index 100% rename from test/unit/solid-host.js rename to test/unit/solid-host-test.js diff --git a/test/unit/tls-authenticator.js b/test/unit/tls-authenticator-test.js similarity index 100% rename from test/unit/tls-authenticator.js rename to test/unit/tls-authenticator-test.js diff --git a/test/unit/token-service.js b/test/unit/token-service-test.js similarity index 100% rename from test/unit/token-service.js rename to test/unit/token-service-test.js diff --git a/test/unit/user-account.js b/test/unit/user-account-test.js similarity index 100% rename from test/unit/user-account.js rename to test/unit/user-account-test.js diff --git a/test/unit/user-accounts-api.js b/test/unit/user-accounts-api-test.js similarity index 100% rename from test/unit/user-accounts-api.js rename to test/unit/user-accounts-api-test.js diff --git a/test/unit/utils.js b/test/unit/utils-test.js similarity index 100% rename from test/unit/utils.js rename to test/unit/utils-test.js diff --git a/test/test-utils.js b/test/utils.js similarity index 100% rename from test/test-utils.js rename to test/utils.js From e55543e7548497cc313e77be934a20f34690aeb9 Mon Sep 17 00:00:00 2001 From: Ruben Verborgh Date: Fri, 11 Aug 2017 14:45:15 -0400 Subject: [PATCH 2/3] Remove specific test commands. --- package.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package.json b/package.json index 1630904fb..e76b5ff94 100644 --- a/package.json +++ b/package.json @@ -101,14 +101,6 @@ "nyc": "NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha", "mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 mocha", "test": "npm run standard && npm run nyc", - "test-integration": "npm run mocha ./test/integration/**/*-test.js", - "test-unit": "npm run mocha ./test/unit/*.js", - "test-debug": "DEBUG='solid:*' npm run mocha", - "test-acl": "npm run mocha ./test/**/*acl*-test.js", - "test-params": "npm run mocha ./test/integration/params-test.js", - "test-http": "npm run mocha ./test/integration/http-test.js", - "test-formats": "npm run mocha ./test/integration/formats-test.js", - "test-errors": "npm run mocha ./test/integration/errors-test.js", "clean": "rm -rf config.json accounts profile inbox .acl settings .meta .meta.acl", "clean-account": "rm -rf accounts profile inbox .acl .meta settings .meta.acl" }, From 6ae001efe24c29a4f53d6cf01ba6535161175e4d Mon Sep 17 00:00:00 2001 From: Ruben Verborgh Date: Fri, 11 Aug 2017 14:47:00 -0400 Subject: [PATCH 3/3] Remove clean scripts. Not needed anymore because of 3659b65f6369eb901dc408575caf2796858ce8e0. --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index e76b5ff94..f1ee872d6 100644 --- a/package.json +++ b/package.json @@ -100,9 +100,7 @@ "standard": "standard", "nyc": "NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha", "mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 mocha", - "test": "npm run standard && npm run nyc", - "clean": "rm -rf config.json accounts profile inbox .acl settings .meta .meta.acl", - "clean-account": "rm -rf accounts profile inbox .acl .meta settings .meta.acl" + "test": "npm run standard && npm run nyc" }, "nyc": { "reporter": [