Follow Mocha naming conventions.

End tests in -test.

Author: RubenVerborgh

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"
   },

test/integration/account-creation-oidc.js …ntegration/account-creation-oidc-test.jstest/integration/account-creation-oidc.js renamed to test/integration/account-creation-oidc-test.js test/integration/account-creation-oidc.js renamed to 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')

test/integration/account-creation-tls.js …integration/account-creation-tls-test.jstest/integration/account-creation-tls.js renamed to test/integration/account-creation-tls-test.js test/integration/account-creation-tls.js renamed to 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')

test/integration/account-manager.js test/integration/account-manager-test.jstest/integration/account-manager.js renamed to test/integration/account-manager-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')
 

test/integration/account-template.js test/integration/account-template-test.jstest/integration/account-template.js renamed to test/integration/account-template-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)

test/integration/acl-oidc.js test/integration/acl-oidc-test.jstest/integration/acl-oidc.js renamed to test/integration/acl-oidc-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'