test: replicate incorrect bundling and missing assertions part of #1323

test/integration/bundle/bundle.test.ts

@@ -3,9 +3,12 @@ import fs from 'fs';
 import path from 'path';
 import { fileCleanup } from '../../helpers';
 
-const spec = fs.readFileSync('./test/integration/bundle/final-asyncapi.yaml', {encoding: 'utf-8'});
+const specV2NoXOrigin = fs.readFileSync('./test/integration/bundle/final-asyncapi.yaml', {encoding: 'utf-8'});
+const specV2WithXOrigin = fs.readFileSync('./test/integration/bundle/final-asyncapi-with-xorigin.yaml', {encoding: 'utf-8'});
+const specv3NoXOrigin = fs.readFileSync('./test/integration/bundle/final-asyncapiv3.yaml', {encoding: 'utf-8'});
+const specv3WithXOrigin = fs.readFileSync('./test/integration/bundle/final-asyncapiv3-with-xorigin.yaml', {encoding: 'utf-8'});
 
-function validateGeneratedSpec(filePath: string, spec: string) {
+function validateGeneratedSpec(filePath: string, spec: string): boolean {
  const generatedSPec = fs.readFileSync(path.resolve(filePath), { encoding: 'utf-8' });
  return generatedSPec === spec;
 }
@@ -56,7 +59,7 @@ describe('bundle', () => {
  ])
  .it('should be able to bundle multiple specs along with custom reference', (ctx, done) => {
  expect(ctx.stdout).to.contain('Check out your shiny new bundled files at test/integration/bundle/final.yaml\n');
- expect(validateGeneratedSpec('test/integration/bundle/final.yaml', spec));
+ expect(validateGeneratedSpec('test/integration/bundle/final.yaml', specV2NoXOrigin)).to.equal(true);
  fileCleanup('./test/integration/bundle/final.yaml');
  done();
  });
@@ -68,7 +71,19 @@ describe('bundle', () => {
  ])
  .it('should be able to bundle correctly with overwriting base file', (ctx, done) => {
  expect(ctx.stdout).to.contain('Check out your shiny new bundled files at test/integration/bundle/final.yaml\n');
- expect(validateGeneratedSpec('test/integration/bundle/final-asyncapi.yaml', spec));
+ expect(validateGeneratedSpec('test/integration/bundle/final.yaml', specV2NoXOrigin)).to.equal(true);
+ fileCleanup('./test/integration/bundle/final.yaml');
+ done();
+ });
+
+ test
+ .stdout()
+ .command([
+ 'bundle', './test/integration/bundle/first-asyncapi.yaml', './test/integration/bundle/feature.yaml', '--output=test/integration/bundle/final.yaml', '-x'
+ ])
+ .it('should be able to bundle multiple specs including x-origin', (ctx, done) => {
+ expect(ctx.stdout).to.contain('Check out your shiny new bundled files at test/integration/bundle/final.yaml\n');
+ expect(validateGeneratedSpec('test/integration/bundle/final.yaml', specV2WithXOrigin)).to.equal(true);
  fileCleanup('./test/integration/bundle/final.yaml');
  done();
  });
@@ -82,6 +97,19 @@ describe('bundle spec v3', () => {
  '--output=test/integration/bundle/final.yaml',
  ]).it('should be able to bundle v3 spec correctly', (ctx, done) => {
  expect(ctx.stdout).to.contain('Check out your shiny new bundled files at test/integration/bundle/final.yaml\n');
+ expect(validateGeneratedSpec('test/integration/bundle/final.yaml', specv3NoXOrigin)).to.equal(true);
+ fileCleanup('./test/integration/bundle/final.yaml');
+ done();
+ });
+
+ test
+ .stdout()
+ .command([
+ 'bundle', './test/integration/bundle/first-asyncapiv3.yaml',
+ '--output=test/integration/bundle/final.yaml', '-x'
+ ]).it('should be able to bundle v3 spec correctly including x-origin', (ctx, done) => {
+ expect(ctx.stdout).to.contain('Check out your shiny new bundled files at test/integration/bundle/final.yaml\n');
+ expect(validateGeneratedSpec('test/integration/bundle/final.yaml', specv3WithXOrigin)).to.equal(true);
  fileCleanup('./test/integration/bundle/final.yaml');
  done();
  });

test/integration/bundle/final-asyncapi-with-xorigin.yaml

@@ -0,0 +1,36 @@
+asyncapi: 2.6.0
+info:
+ title: Account Service
+ version: 1.0.0
+ description: This service is in charge of processing user signups
+channels:
+ user/signedup:
+ subscribe:
+ message:
+ payload:
+ type: object
+ properties:
+ displayName:
+ type: string
+ description: Name of the user
+ email:
+ type: string
+ format: email
+ description: Email of the user
+ x-origin: ./test/integration/bundle/messages.yaml#/messages/UserSignedUp
+ user/loggedOut:
+ subscribe:
+ message:
+ payload:
+ type: object
+ properties:
+ displayName:
+ type: string
+ description: Name of the user
+ userId:
+ type: string
+ description: Id the user
+ timestamp:
+ type: number
+ description: Time stamp when the user logged out
+ x-origin: ./test/integration/bundle/messages.yaml#/messages/UserLoggedOut

test/integration/bundle/final-asyncapi.yaml

@@ -7,34 +7,28 @@ channels:
  user/signedup:
  subscribe:
  message:
- $ref: '#/components/messages/UserSignedUp'
+ payload:
+ type: object
+ properties:
+ displayName:
+ type: string
+ description: Name of the user
+ email:
+ type: string
+ format: email
+ description: Email of the user
  user/loggedOut:
- unsubcribe:
+ subscribe:
  message:
- $ref: '#/components/messages/UserLoggedOut'
-components:
- messages:
- UserSignedUp:
- payload:
- type: object
- properties:
- displayName:
- type: string
- description: Name of the user
- email:
- type: string
- format: email
- description: Email of the user
- UserLoggedOut:
- payload:
- type: object
- properties:
- displayName:
- type: string
- description: Name of the user
- userId:
- type: string
- description: Id the user
- timestamp:
- type: number
- descriptio: Time stamp when the user logged out
+ payload:
+ type: object
+ properties:
+ displayName:
+ type: string
+ description: Name of the user
+ userId:
+ type: string
+ description: Id the user
+ timestamp:
+ type: number
+ description: Time stamp when the user logged out

test/integration/bundle/final-asyncapiv3-with-xorigin.yaml

@@ -0,0 +1,50 @@
+asyncapi: 3.0.0
+info:
+ title: Example Service
+ version: 1.0.0
+ description: Example Service.
+channels:
+ commentLikedChannel:
+ address: comment/liked
+ x-origin: ./test/integration/bundle/channels.yaml#/channels/commentLikedChannel
+ userSignedup:
+ address: user/signedup
+ messages:
+ userSignedUpMessage:
+ payload:
+ type: object
+ properties:
+ displayName:
+ type: string
+ description: Name of the user
+ email:
+ type: string
+ format: email
+ description: Email of the user
+ x-origin: ./test/integration/bundle/messages.yaml#/messages/UserSignedUp
+ test:
+ address: /test
+ messages:
+ testMessage:
+ payload:
+ type: string
+ x-origin: '#/components/messages/TestMessage'
+operations:
+ UserSignedUp:
+ action: send
+ channel:
+ $ref: '#/channels/userSignedup'
+ messages:
+ - $ref: '#/channels/userSignedup/messages/userSignedUpMessage'
+ TestOpp:
+ action: send
+ channel:
+ $ref: '#/channels/test'
+ messages:
+ - $ref: '#/channels/test/messages/testMessage'
+components:
+ messages:
+ TestMessage:
+ payload:
+ type: string
+ x-origin: '#/components/messages/TestMessage'

test/integration/bundle/final-asyncapiv3.yaml

@@ -0,0 +1,46 @@
+asyncapi: 3.0.0
+info:
+ title: Example Service
+ version: 1.0.0
+ description: Example Service.
+channels:
+ commentLikedChannel:
+ address: comment/liked
+ userSignedup:
+ address: user/signedup
+ messages:
+ userSignedUpMessage:
+ payload:
+ type: object
+ properties:
+ displayName:
+ type: string
+ description: Name of the user
+ email:
+ type: string
+ format: email
+ description: Email of the user
+ test:
+ address: /test
+ messages:
+ testMessage:
+ payload:
+ type: string
+operations:
+ UserSignedUp:
+ action: send
+ channel:
+ $ref: '#/channels/userSignedup'
+ messages:
+ - $ref: '#/channels/userSignedup/messages/userSignedUpMessage'
+ TestOpp:
+ action: send
+ channel:
+ $ref: '#/channels/test'
+ messages:
+ - $ref: '#/channels/test/messages/testMessage'
+components:
+ messages:
+ TestMessage:
+ payload:
+ type: string

test/integration/bundle/first-asyncapi.yaml

@@ -7,4 +7,8 @@ channels:
  user/signedup:
  subscribe:
  message:
- $ref: "./test/integration/bundle/messages.yaml#/messages/UserSignedUp"
+ $ref: "./test/integration/bundle/messages.yaml#/messages/UserSignedUp"
+ user/loggedOut:
+ subscribe:
+ message:
+ $ref: "./test/integration/bundle/messages.yaml#/messages/UserLoggedOut"

test/integration/bundle/first-asyncapiv3.yaml

@@ -6,3 +6,31 @@ info:
 channels:
  commentLikedChannel:
  $ref: './test/integration/bundle/channels.yaml#/channels/commentLikedChannel'
+ userSignedup:
+ address: 'user/signedup'
+ messages:
+ userSignedUpMessage:
+ $ref: './test/integration/bundle/messages.yaml#/messages/UserSignedUp'
+ test:
+ address: '/test'
+ messages:
+ testMessage:
+ $ref: '#/components/messages/TestMessage'
+operations:
+ UserSignedUp:
+ action: send
+ channel:
+ $ref: '#/channels/userSignedup'
+ messages:
+ - $ref: '#/channels/userSignedup/messages/userSignedUpMessage'
+ TestOpp:
+ action: send
+ channel:
+ $ref: '#/channels/test'
+ messages:
+ - $ref: '#/channels/test/messages/testMessage'
+components:
+ messages:
+ TestMessage:
+ payload:
+ type: string