Skip to content

Commit b6d809a

Browse files
committed
Merged changes from develop, ran tests.
A couple of test failures, but that's partly because we have values set for min and max that are static and don't reflect changes in the database itself.
1 parent d33eb4c commit b6d809a

30 files changed

+4198
-4198
lines changed

public/tests.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

public/tests.json

Lines changed: 4168 additions & 4168 deletions
Large diffs are not rendered by default.

test/v1.5-data-geopoliticalunits-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('tests for /v1.5/data/geopoliticalunits', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "An array of geopolitical units."', function() {
1010
const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits', {
11-
'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 2, 'lower': false},
11+
'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 3, 'lower': true},
1212
'time': true,
1313
});
1414

test/v1.5-data-geopoliticalunits-{gpid}-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const expect = chakram.expect;
77
describe('tests for /v1.5/data/geopoliticalunits/{gpid}', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "An array of geopolitical units."', function() {
10-
const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits/7139', {
10+
const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits/3757', {
1111
'time': true,
1212
});
1313

test/v2.0-apps-constdb-datasetages-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasetages', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "Returns an ordered array (from earliest to latest) of upload counts by month (YYYY/MM/DD; all days as 01). Months with no uploads are excluded. "', function() {
1010
const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasetages', {
11-
'qs': {'dbid': 24},
11+
'qs': {'dbid': 2},
1212
'time': true,
1313
});
1414

test/v2.0-apps-constdb-datasets-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasets', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "Returns the set of datasets contained within a constituent database, identified by the constituent database identifier. Used for quick landing page generation. "', function() {
1010
const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasets', {
11-
'qs': {'dbid': 3},
11+
'qs': {'dbid': 12},
1212
'time': true,
1313
});
1414

test/v2.0-apps-constdb-datasetuploads-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasetuploads', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "Returns an ordered array (from earliest to latest) of upload counts by month (YYYY/MM/DD; all days as 01). Months with no uploads are excluded. "', function() {
1010
const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasetuploads', {
11-
'qs': {'dbid': 5},
11+
'qs': {'dbid': 4},
1212
'time': true,
1313
});
1414

test/v2.0-apps-depenvt-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/depenvt', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "This returns the information about depositional environment for selected dataset/collention unit/site."', function() {
1010
const response = request('get', 'http://localhost:3001/v2.0/apps/depenvt', {
11-
'qs': {'siteid': 40330, 'datasetid': 54743789, 'collectionunitid': 12735},
11+
'qs': {'siteid': 46657, 'datasetid': 23394951, 'collectionunitid': 37977},
1212
'time': true,
1313
});
1414

test/v2.0-apps-taphonomysystems-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/taphonomysystems', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "A table of Neotoma collection types."', function() {
1010
const response = request('get', 'http://localhost:3001/v2.0/apps/taphonomysystems', {
11-
'qs': {'datasettypeid': 39},
11+
'qs': {'datasettypeid': 35},
1212
'time': true,
1313
});
1414

test/v2.0-data-chronologies-{chronid}-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const expect = chakram.expect;
77
describe('tests for /v2.0/data/chronologies/{chronid}', function() {
88
describe('tests for get', function() {
99
it('should respond 200 for "A Neotoma chronology object."', function() {
10-
const response = request('get', 'http://localhost:3001/v2.0/data/chronologies/7361', {
10+
const response = request('get', 'http://localhost:3001/v2.0/data/chronologies/500', {
1111
'time': true,
1212
});
1313

0 commit comments

Comments
 (0)