Removed %20's, fixed tests

klon · Aug 26, 2019 · 0f2b462 · 0f2b462
1 parent 148d0da
commit 0f2b462
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 31 deletions.
diff --git a/lib/definitions.js b/lib/definitions.js
@@ -74,12 +74,12 @@ internals.append = function(definitionName, definition, currentCollection, force
     // else create a new item using definitionName or next model number
     if (forceDynamicName) {
       if (settings.definitionPrefix === 'useLabel') {
-        out = internals.nextModelName(definitionName + ' ', currentCollection);
+        out = internals.nextModelName(definitionName, currentCollection);
       } else {
-        out = internals.nextModelName('Model ', currentCollection);
+        out = internals.nextModelName('Model', currentCollection);
       }
     } else {
-      out = definitionName || internals.nextModelName('Model ', currentCollection);
+      out = definitionName || internals.nextModelName('Model', currentCollection);
     }
     currentCollection[out] = definition;
   }

diff --git a/test/Integration/alternatives-test.js b/test/Integration/alternatives-test.js
@@ -218,7 +218,7 @@ lab.experiment('alternatives', () => {
       required: ['name']
     });
 
-    expect(response.result.definitions['Model 1']).to.equal({
+    expect(response.result.definitions['Model1']).to.equal({
       type: 'object',
       properties: {
         type: {
@@ -288,7 +288,7 @@ lab.experiment('alternatives', () => {
         in: 'body',
         name: 'body',
         schema: {
-          $ref: '#/definitions/Model%201'
+          $ref: '#/definitions/Model1'
         }
       }
     ]);
@@ -314,7 +314,7 @@ lab.experiment('alternatives', () => {
         },
         type: 'object'
       },
-      'Model 1': {
+      'Model1': {
         properties: {
           type: {
             type: 'string',

diff --git a/test/Integration/builder-test.js b/test/Integration/builder-test.js
@@ -110,7 +110,7 @@ lab.experiment('builder', () => {
           type: 'string'
         }
       },
-      'Model 1': {
+      'Model1': {
         type: 'object',
         properties: {
           number: {
@@ -144,7 +144,7 @@ lab.experiment('builder', () => {
           type: 'string'
         }
       },
-      'Model 1': {
+      'Model1': {
         type: 'object',
         properties: {
           number: {
@@ -183,7 +183,7 @@ lab.experiment('builder', () => {
           }
         }
       },
-      'Model 1': {
+      'Model1': {
         type: 'object',
         properties: {
           a: {
@@ -222,7 +222,7 @@ lab.experiment('builder', () => {
           }
         }
       },
-      'Model 1': {
+      'Model1': {
         type: 'object',
         properties: {
           a: {

diff --git a/test/Integration/child-model.js b/test/Integration/child-model.js
@@ -102,10 +102,10 @@ lab.experiment('child-models', () => {
     expect(response.statusCode).to.equal(200);
 
     expect(response.result.paths['/foo/v1/bar'].post.parameters[0].schema).to.equal({
-      $ref: '#/definitions/Model%201'
+      $ref: '#/definitions/Model1'
     });
 
-    expect(response.result.definitions['Model 1']).to.equal({
+    expect(response.result.definitions['Model1']).to.equal({
       properties: {
         outer1: {
           $ref: '#/definitions/outer1'

diff --git a/test/Integration/definitions-test.js b/test/Integration/definitions-test.js
@@ -65,7 +65,7 @@ lab.experiment('definitions', () => {
             b: Joi.object({
               c: Joi.string()
             })
-          }).label('Model 1')
+          }).label('Model1')
         }
       }
     }
@@ -102,9 +102,9 @@ lab.experiment('definitions', () => {
 
     expect(response.statusCode).to.equal(200);
     expect(response.result.paths['/test/'].post.parameters[0].schema).to.equal({
-      $ref: '#/definitions/Model%201'
+      $ref: '#/definitions/Model1'
     });
-    expect(response.result.definitions['Model 1']).to.equal(definition);
+    expect(response.result.definitions['Model1']).to.equal(definition);
     const isValid = await Validate.test(response.result);
     expect(isValid).to.be.true();
   });
@@ -116,7 +116,7 @@ lab.experiment('definitions', () => {
     //console.log(JSON.stringify(response.result.definitions));
     expect(response.result.definitions.b).to.exists();
     expect(response.result.definitions.Model).to.exists();
-    expect(response.result.definitions['Model 1']).to.exists();
+    expect(response.result.definitions['Model1']).to.exists();
 
     const isValid = await Validate.test(response.result);
     expect(isValid).to.be.true();
@@ -233,7 +233,7 @@ lab.experiment('definitions', () => {
     expect(response.statusCode).to.equal(200);
     expect(response.result.definitions.A).to.exist();
     expect(response.result.definitions['A A']).to.exist();
-    expect(response.result.definitions['A 1']).to.exist();
+    expect(response.result.definitions['A1']).to.exist();
     const isValid = await Validate.test(response.result);
     expect(isValid).to.be.true();
   });

diff --git a/test/Integration/path-test.js b/test/Integration/path-test.js
@@ -576,7 +576,7 @@ lab.experiment('path', () => {
         in: 'body',
         name: 'body',
         schema: {
-          $ref: '#/definitions/Model%201'
+          $ref: '#/definitions/Model1'
         }
       }
     ]);

diff --git a/test/Integration/plugin-test.js b/test/Integration/plugin-test.js
@@ -385,7 +385,7 @@ lab.experiment('plugin', () => {
     const response = await server.inject({ method: 'GET', url: '/swagger.json' });
     //console.log(JSON.stringify(response.result));
     expect(response.result.definitions).to.equal({
-      'Model 1': {
+      'Model1': {
         type: 'object',
         properties: {
           a: {

diff --git a/test/Integration/proxy-test.js b/test/Integration/proxy-test.js
@@ -197,7 +197,7 @@ lab.experiment('proxies', () => {
         in: 'body',
         name: 'body',
         schema: {
-          $ref: '#/definitions/Model%201'
+          $ref: '#/definitions/Model1'
         }
       }
     ]);
@@ -387,7 +387,7 @@ lab.experiment('proxies', () => {
         required: ['a'],
         type: 'object'
       },
-      'Model 1': {
+      'Model1': {
         properties: {
           b: {
             type: 'string',

diff --git a/test/Integration/responses-tests.js b/test/Integration/responses-tests.js
@@ -530,18 +530,18 @@ lab.experiment('responses', () => {
 
     const server = await Helper.createServer({}, routes);
     const response = await server.inject({ url: '/swagger.json' });
-    expect(response.result.definitions['Model 1']).to.exist();
-    expect(response.result.definitions['Model 2']).to.exist();
+    expect(response.result.definitions['Model1']).to.exist();
+    expect(response.result.definitions['Model2']).to.exist();
     expect(response.result.definitions).to.equal({
-      'Model 1': {
+      'Model1': {
         type: 'object',
         properties: {
           value2222: {
             type: 'boolean'
           }
         }
       },
-      'Model 2': {
+      'Model2': {
         type: 'object',
         properties: {
           value1111: {
@@ -873,19 +873,19 @@ lab.experiment('responses', () => {
             },
             '400': {
               schema: {
-                $ref: '#/definitions/Model%201'
+                $ref: '#/definitions/Model1'
               },
               description: '400 - Added from plugin-options'
             },
             '404': {
               description: '404 from response status object',
               schema: {
-                $ref: '#/definitions/Model%201'
+                $ref: '#/definitions/Model1'
               }
             },
             '429': {
               schema: {
-                $ref: '#/definitions/Model%201'
+                $ref: '#/definitions/Model1'
               },
               description: 'Too Many Requests'
             },

diff --git a/test/unit/property-test.js b/test/unit/property-test.js
@@ -65,7 +65,7 @@ lab.experiment('property - ', () => {
       format: 'binary'
     });
     expect(propertiesNoAlt.parseProperty('x', Joi.array(), null, 'body', true, false)).to.equal({
-      $ref: '#/definitions/Model%201'
+      $ref: '#/definitions/Model1'
     });
     expect(propertiesNoAlt.parseProperty('x', Joi.any(), null, 'body', true, false)).to.equal({ type: 'string' });
     //expect(propertiesNoAlt.parseProperty('x', Joi.func(), null, 'body', true, false)).to.equal({ 'type': 'string' });

diff --git a/test/unit/validate-test.js b/test/unit/validate-test.js
@@ -23,7 +23,7 @@ const swaggerJSON = {
             in: 'body',
             name: 'body',
             schema: {
-              $ref: '#/definitions/Model 1'
+              $ref: '#/definitions/Model1'
             }
           }
         ],
@@ -40,7 +40,7 @@ const swaggerJSON = {
     }
   },
   definitions: {
-    'Model 1': {
+    'Model1': {
       type: 'object',
       properties: {
         a: {