updated

Author: IITI-tushar

e2e/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts

@@ -5,11 +5,3 @@ const config = "samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml";
 describe(config, () => {
   performTests(config);
 });
-
-const duplicateChaincodeConfig = "samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml";
-
-describe(duplicateChaincodeConfig, () => {
-  it("should throw an error for duplicate chaincode names across different channels", () => {
-    expect(() => performTests(duplicateChaincodeConfig)).toThrowError(/Duplicate chaincode name found/);
-  });
-});

e2e/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts

@@ -4,12 +4,4 @@ const config = "samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml";
 
 describe(config, () => {
   performTests(config);
-});
-
-const duplicateChaincodeConfig = "samples/fablo-config-hlf2-2orgs-2chaincodes-raft-duplicate.yaml";
-
-describe(duplicateChaincodeConfig, () => {
-  it("should throw an error for duplicate chaincode names across different channels", () => {
-    expect(() => performTests(duplicateChaincodeConfig)).toThrowError(/Duplicate chaincode name found/);
-  });
-});
+});

e2e/fabloCommands.test.ts

@@ -137,6 +137,18 @@ describe("validate", () => {
     expect(commandResult.output).toContain(" instance.orgs[0].organization.mspName : does not match pattern");
     expect(commands.getFiles()).toEqual([]);
   });
+  
+  it("should throw an error for duplicate chaincode names across different channels", () => {
+    // Given
+    const fabloConfig = `${commands.relativeRoot}/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml`;
+  
+    // When
+    const commandResult = commands.fabloExec(`validate ${fabloConfig}`);
+  
+    // Then
+    expect(commandResult).toEqual(TestCommands.failure());
+    expect(commandResult.output).toContain("Duplicate chaincode name found");
+  });
 });
 
 describe("extend config", () => {