Trying to make integrations tests a little easier to read

Author: megoth

test/integration/cors-proxy-test.js

@@ -1,18 +1,14 @@
 var assert = require('chai').assert
-var supertest = require('supertest')
 var path = require('path')
 var nock = require('nock')
-var { checkDnsSettings } = require('../utils')
-
-var ldnode = require('../../index')
+var { checkDnsSettings, setupSupertestServer } = require('../utils')
 
 describe('CORS Proxy', () => {
-  var ldp = ldnode({
+  var server = setupSupertestServer({
     root: path.join(__dirname, '../resources'),
     corsProxy: '/proxy',
     webid: false
   })
-  var server = supertest(ldp)
 
   before(checkDnsSettings)
 

test/integration/errors-test.js

@@ -1,30 +1,20 @@
-var supertest = require('supertest')
 var path = require('path')
-
-// Helper functions for the FS
-// var rm = require('./utils').rm
-// var write = require('./utils').write
-// var cp = require('./utils').cp
-var read = require('./../utils').read
-
-var ldnode = require('../../index')
+const { read, setupSupertestServer } = require('./../utils')
 
 describe('Error pages', function () {
   // LDP with error pages
-  var errorLdp = ldnode({
+  const errorServer = setupSupertestServer({
     root: path.join(__dirname, '../resources'),
     errorPages: path.join(__dirname, '../resources/errorPages'),
     webid: false
   })
-  var errorServer = supertest(errorLdp)
 
   // LDP with no error pages
-  var noErrorLdp = ldnode({
+  const noErrorServer = setupSupertestServer({
     root: path.join(__dirname, '../resources'),
     noErrorPages: true,
     webid: false
   })
-  var noErrorServer = supertest(noErrorLdp)
 
   function defaultErrorPage (filepath, expected) {
     var handler = function (res) {

test/integration/formats-test.js

@@ -1,15 +1,13 @@
-var supertest = require('supertest')
-var ldnode = require('../../index')
 var path = require('path')
 const assert = require('chai').assert
+const { setupSupertestServer } = require('../utils')
 
 describe('formats', function () {
-  var ldp = ldnode.createServer({
+  const server = setupSupertestServer({
     root: path.join(__dirname, '../resources'),
     webid: false
   })
 
-  var server = supertest(ldp)
   describe('HTML', function () {
     it('should return HTML containing "Hello, World!" if Accept is set to text/html', function (done) {
       server.get('/hello.html')

test/integration/http-test.js

@@ -1,21 +1,19 @@
-var supertest = require('supertest')
 var fs = require('fs')
 var li = require('li')
-var ldnode = require('../../index')
 var rm = require('./../utils').rm
 var path = require('path')
 const rdf = require('rdflib')
+const { setupSupertestServer } = require('../utils')
 
 var suffixAcl = '.acl'
 var suffixMeta = '.meta'
-var ldpServer = ldnode.createServer({
+var server = setupSupertestServer({
   live: true,
   dataBrowserPath: 'default',
   root: path.join(__dirname, '../resources'),
   auth: 'oidc',
   webid: false
 })
-var server = supertest(ldpServer)
 var { assert, expect } = require('chai')
 
 /**

test/integration/validate-tts.js

@@ -1,8 +1,8 @@
 const fs = require('fs')
 const path = require('path')
-const { setupSuperServer } = require('../utils')
+const { setupSupertestServer } = require('../utils')
 
-const server = setupSuperServer({
+const server = setupSupertestServer({
   live: true,
   dataBrowserPath: 'default',
   root: path.join(__dirname, '../resources'),

test/utils.js

@@ -88,7 +88,7 @@ function createServer (options) {
   return ldnode.createServer(options)
 }
 
-exports.setupSuperServer = setupSuperServer
+exports.setupSupertestServer = setupSuperServer
 function setupSuperServer (options) {
   const ldpServer = createServer(options)
   return supertest(ldpServer)