Cleaned error in openapi parameters. Reran clean validate.

Author: SimonGoring

openapi.yaml

@@ -252,17 +252,6 @@ aggdatasetidPath:
     maximum: 60000
     minimum: 1
     type: integer
-datasetidPath:
-  description: Valid Neotoma dataset identifier (integer), either singly or in a comma separated list.
-  in: path
-  name: datasetid
-  required: true
-  schema:
-    example: 100
-    format: int32
-    maximum: 60000
-    minimum: 1
-    type: integer
 datasetidQuery:
   description: Valid Neotoma dataset identifier (integer), either singly or in a comma separated list.
   in: query

openapi/components/parameters/parameters.yml

@@ -7,11 +7,7 @@ const expect = chakram.expect;
 describe('tests for /v1.5/data/contacts/{contactid}', function() {
   describe('tests for get', function() {
     it('should respond 200 for "Contact"', function() {
-<<<<<<< HEAD
       const response = request('get', 'http://localhost:3001/v1.5/data/contacts/500', {
-=======
-      const response = request('get', 'http://localhost:3001/v1.5/data/contacts/-7161913', {
->>>>>>> develop
         'time': true,
       });
 

public/tests.html

@@ -8,11 +8,7 @@ describe('tests for /v1.5/data/geopoliticalunits', function() {
   describe('tests for get', function() {
     it('should respond 200 for "An array of geopolitical units."', function() {
       const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits', {
-<<<<<<< HEAD
-        'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 3, 'lower': false},
-=======
         'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 4, 'lower': false},
->>>>>>> develop
         'time': true,
       });
 

public/tests.json

@@ -7,11 +7,7 @@ const expect = chakram.expect;
 describe('tests for /v1.5/data/geopoliticalunits/{gpid}', function() {
   describe('tests for get', function() {
     it('should respond 200 for "An array of geopolitical units."', function() {
-<<<<<<< HEAD
-      const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits/500', {
-=======
-      const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits/7309', {
->>>>>>> develop
+      const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits/887', {
         'time': true,
       });
 

test/v1.5-data-contacts-{contactid}-test.js

@@ -8,11 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasetages', function() {
   describe('tests for get', function() {
     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() {
       const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasetages', {
-<<<<<<< HEAD
-        'qs': {'dbid': 8},
-=======
-        'qs': {'dbid': 10},
->>>>>>> develop
+        'qs': {'dbid': 34},
         'time': true,
       });
 

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

@@ -8,11 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasets', function() {
   describe('tests for get', function() {
     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() {
       const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasets', {
-<<<<<<< HEAD
-        'qs': {'dbid': 5},
-=======
-        'qs': {'dbid': 35},
->>>>>>> develop
+        'qs': {'dbid': 13},
         'time': true,
       });
 

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

@@ -8,11 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasetuploads', function() {
   describe('tests for get', function() {
     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() {
       const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasetuploads', {
-<<<<<<< HEAD
-        'qs': {'dbid': 33},
-=======
-        'qs': {'dbid': 25},
->>>>>>> develop
+        'qs': {'dbid': 5},
         'time': true,
       });