From 982b32acd6155644d29f327e3c27a1be76d6882d Mon Sep 17 00:00:00 2001
From: acalcutt <acalcutt@techidiots.net>
Date: Fri, 16 Sep 2022 16:31:55 -0400
Subject: [PATCH] fix tests

---
 test/metadata.js | 16 ++++++++--------
 test/setup.js    | 10 ++++++----
 test/style.js    | 14 +++++++-------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/test/metadata.js b/test/metadata.js
index b4594b1..f4026ba 100644
--- a/test/metadata.js
+++ b/test/metadata.js
@@ -11,8 +11,8 @@ var testTileJSONArray = function(url) {
       supertest(app)
         .get(url)
         .expect(function(res) {
-          res.body.should.be.Array();
-          res.body.length.should.be.greaterThan(0);
+          expect(res.body).to.be.a('array');
+          expect(res.body.length).to.be.greaterThan(0);
         }).end(done);
     });
   });
@@ -31,7 +31,7 @@ var testTileJSON = function(url) {
       supertest(app)
         .get(url)
         .expect(function(res) {
-          res.body.tiles.length.should.be.greaterThan(0);
+          expect(res.body.tiles.length).to.be.greaterThan(0);
         }).end(done);
     });
   });
@@ -62,11 +62,11 @@ describe('Metadata', function() {
       supertest(app)
         .get('/styles.json')
         .expect(function(res) {
-          res.body.should.be.Array();
-          res.body.length.should.be.greaterThan(0);
-          res.body[0].version.should.equal(8);
-          res.body[0].id.should.be.String();
-          res.body[0].name.should.be.String();
+          expect(res.body).to.be.a('array');
+          expect(res.body.length).to.be.greaterThan(0);
+          expect(res.body[0].version).to.be.equal(8);
+          expect(res.body[0].id).to.be.a('string');
+          expect(res.body[0].name).to.be.a('string');
         }).end(done);
     });
   });
diff --git a/test/setup.js b/test/setup.js
index 4e8d0a0..f76747f 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -1,14 +1,16 @@
 process.env.NODE_ENV = 'test';
 
-global.should = require('should');
-global.supertest = require('supertest');
+import { expect } from 'chai'; 
+import supertest from "supertest";
+import { server } from '../src/server.js';
 
-require = require('esm')(module);
+global.expect = expect
+global.supertest = supertest
 
 before(function() {
   console.log('global setup');
   process.chdir('test_data');
-  var running = require('../src/server')({
+  var running = server({
     configPath: 'config.json',
     port: 8888,
     publicUrl: '/test/'
diff --git a/test/style.js b/test/style.js
index 938798d..1ba9719 100644
--- a/test/style.js
+++ b/test/style.js
@@ -18,13 +18,13 @@ describe('Styles', function() {
       supertest(app)
         .get('/styles/' + prefix + '/style.json')
         .expect(function(res) {
-          res.body.version.should.equal(8);
-          res.body.name.should.be.String();
-          res.body.sources.should.be.Object();
-          res.body.glyphs.should.be.String();
-          res.body.sprite.should.be.String();
-          res.body.sprite.should.equal('/test/styles/test-style/sprite');
-          res.body.layers.should.be.Array();
+          expect(res.body.version).to.be.equal(8);
+          expect(res.body.name).to.be.a('string');
+          expect(res.body.sources).to.be.a('object');
+          expect(res.body.glyphs).to.be.a('string');
+          expect(res.body.sprite).to.be.a('string');
+          expect(res.body.sprite).to.be.equal('/test/styles/test-style/sprite');
+          expect(res.body.layers).to.be.a('array');
         }).end(done);
     });
   });