test: use gitsubmodule for conformance features and reorganize test dir

lance · lance · commit 2e863021c7d8 · 2020-07-03T11:21:01.000-04:00
Signed-off-by: Lance Ball &lt;lball@redhat.com&gt;
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "conformance"]
+	path = conformance
+	url = git@github.com:cloudevents/conformance.git
diff --git a/conformance b/conformance
@@ -0,0 +1 @@
+Subproject commit dcd8f605595847bb6d7e46c14deaefaf9984f5f3
diff --git a/conformance/http-protocol-binding.feature b/conformance/http-protocol-binding.feature
diff --git a/cucumber.js b/cucumber.js
@@ -1,8 +1,8 @@
 // cucumber.js
 let common = [
-  "conformance/**/*.feature", // Specify our feature files
+  "conformance/features/http-protocol-binding.feature", // Specify our feature files
   "--require-module ts-node/register", // Load TypeScript module
-  "--require conformance/support/steps.ts", // Load step definitions
+  "--require test/conformance/steps.ts", // Load step definitions
   "--format progress-bar", // Load custom formatter
   "--format node_modules/cucumber-pretty", // Load custom formatter
 ].join(" ");
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "lint": "eslint 'src/**/*.{js,ts}' 'test/**/*.{js,ts}'",
     "lint:fix": "eslint 'src/**/*.{js,ts}' 'test/**/*.{js,ts}' --fix",
     "pretest": "npm run lint && npm run conformance",
-    "test": "mocha --require ts-node/register ./test/**/*.ts",
+    "test": "mocha --require ts-node/register ./test/integration/**/*.ts",
     "conformance": "cucumber-js -p default",
     "coverage": "nyc --reporter=lcov --reporter=text npm run test",
     "coverage-publish": "wget -qO - https://coverage.codacy.com/get.sh | bash -s report -l JavaScript -r coverage/lcov.info",
diff --git a/test/conformance/steps.ts b/test/conformance/steps.ts
diff --git a/test/integration/cloud_event_test.ts b/test/integration/cloud_event_test.ts
@@ -1,7 +1,7 @@
 import { expect } from "chai";
-import { CloudEvent, Version } from "../src";
-import { CloudEventV03 } from "../src/event/v03";
-import { CloudEventV1 } from "../src/event/v1";
+import { CloudEvent, Version } from "../../src";
+import { CloudEventV03 } from "../../src/event/v03";
+import { CloudEventV1 } from "../../src/event/v1";
 
 const type = "org.cncf.cloudevents.example";
 const source = "http://unit.test";
diff --git a/test/integration/constants_test.ts b/test/integration/constants_test.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import CONSTANTS from "../src/constants";
+import CONSTANTS from "../../src/constants";
 
 describe("Constants exposed by top level exports", () => {
   it("Exports an ENCODING_BASE64 constant", () => {
diff --git a/test/integration/http_binding_03.ts b/test/integration/http_binding_03.ts
@@ -2,8 +2,8 @@ import "mocha";
 import { expect } from "chai";
 import nock from "nock";
 
-import { emitBinary, emitStructured } from "../src/transport/http";
-import { CloudEvent, Version } from "../src";
+import { emitBinary, emitStructured } from "../../src/transport/http";
+import { CloudEvent, Version } from "../../src";
 import { AxiosResponse } from "axios";
 
 const type = "com.github.pull.create";
diff --git a/test/integration/http_binding_1.ts b/test/integration/http_binding_1.ts
@@ -3,9 +3,9 @@ import "mocha";
 import { expect } from "chai";
 import nock from "nock";
 
-import { CloudEvent, Version } from "../src";
-import { emitBinary, emitStructured } from "../src/transport/http";
-import { asBase64 } from "../src/event/validation/is";
+import { CloudEvent, Version } from "../../src";
+import { emitBinary, emitStructured } from "../../src/transport/http";
+import { asBase64 } from "../../src/event/validation/is";
 import { AxiosResponse } from "axios";
 
 const type = "com.github.pull.create";
diff --git a/test/integration/http_emitter_test.ts b/test/integration/http_emitter_test.ts
@@ -1,11 +1,11 @@
 import "mocha";
 import { expect } from "chai";
 import nock from "nock";
-import CONSTANTS from "../src/constants";
+import CONSTANTS from "../../src/constants";
 
 const DEFAULT_CE_CONTENT_TYPE = CONSTANTS.DEFAULT_CE_CONTENT_TYPE;
 
-import { CloudEvent, Version, Emitter, Protocol, headersFor } from "../src";
+import { CloudEvent, Version, Emitter, Protocol, headersFor } from "../../src";
 import { AxiosResponse } from "axios";
 
 const receiver = "https://cloudevents.io/";
diff --git a/test/integration/http_receiver_test.ts b/test/integration/http_receiver_test.ts
@@ -1,7 +1,7 @@
 import "mocha";
 import { expect } from "chai";
-import { CloudEvent, Receiver, ValidationError } from "../src";
-import { CloudEventV1 } from "../src/event/v1";
+import { CloudEvent, Receiver, ValidationError } from "../../src";
+import { CloudEventV1 } from "../../src/event/v1";
 
 const receiver = new Receiver();
 const id = "1234";
diff --git a/test/integration/parser_test.ts b/test/integration/parser_test.ts
@@ -1,8 +1,8 @@
 import "mocha";
 import { expect } from "chai";
 
-import { JSONParser as Parser } from "../src/parsers/";
-import { ValidationError } from "../src/";
+import { JSONParser as Parser } from "../../src/parsers/";
+import { ValidationError } from "../../src/";
 
 describe("JSON Event Format Parser", () => {
   it("Throw error when payload is an integer", () => {
diff --git a/test/integration/receiver_binary_03_tests.ts b/test/integration/receiver_binary_03_tests.ts
@@ -1,9 +1,9 @@
 import "mocha";
 import { expect } from "chai";
 
-import { CloudEvent, ValidationError, Version } from "../src";
-import { BinaryHTTPReceiver } from "../src/transport/http/binary_receiver";
-import CONSTANTS from "../src/constants";
+import { CloudEvent, ValidationError, Version } from "../../src";
+import { BinaryHTTPReceiver } from "../../src/transport/http/binary_receiver";
+import CONSTANTS from "../../src/constants";
 
 const receiver = new BinaryHTTPReceiver(Version.V03);
 
diff --git a/test/integration/receiver_binary_1_tests.ts b/test/integration/receiver_binary_1_tests.ts
@@ -1,10 +1,10 @@
 import "mocha";
 import { expect } from "chai";
 
-import { CloudEvent, ValidationError, Version } from "../src";
-import { asBase64 } from "../src/event/validation";
-import { BinaryHTTPReceiver } from "../src/transport/http/binary_receiver";
-import CONSTANTS from "../src/constants";
+import { CloudEvent, ValidationError, Version } from "../../src";
+import { asBase64 } from "../../src/event/validation";
+import { BinaryHTTPReceiver } from "../../src/transport/http/binary_receiver";
+import CONSTANTS from "../../src/constants";
 
 const receiver = new BinaryHTTPReceiver(Version.V1);
 
diff --git a/test/integration/receiver_structured_0_3_test.ts b/test/integration/receiver_structured_0_3_test.ts
@@ -1,8 +1,8 @@
 import "mocha";
 import { expect } from "chai";
 
-import { CloudEvent, ValidationError, Version } from "../src";
-import { StructuredHTTPReceiver } from "../src/transport/http/structured_receiver";
+import { CloudEvent, ValidationError, Version } from "../../src";
+import { StructuredHTTPReceiver } from "../../src/transport/http/structured_receiver";
 
 const receiver = new StructuredHTTPReceiver(Version.V03);
 const type = "com.github.pull.create";
diff --git a/test/integration/receiver_structured_1_test.ts b/test/integration/receiver_structured_1_test.ts
@@ -1,9 +1,9 @@
 import "mocha";
 import { expect } from "chai";
 
-import { CloudEvent, ValidationError, Version } from "../src";
-import { asBase64 } from "../src/event/validation";
-import { StructuredHTTPReceiver } from "../src/transport/http/structured_receiver";
+import { CloudEvent, ValidationError, Version } from "../../src";
+import { asBase64 } from "../../src/event/validation";
+import { StructuredHTTPReceiver } from "../../src/transport/http/structured_receiver";
 
 const receiver = new StructuredHTTPReceiver(Version.V1);
 const type = "com.github.pull.create";
diff --git a/test/integration/sdk_test.ts b/test/integration/sdk_test.ts
@@ -1,6 +1,6 @@
 import "mocha";
 import { expect } from "chai";
-import { CloudEvent, Receiver, Emitter, Version } from "../src";
+import { CloudEvent, Receiver, Emitter, Version } from "../../src";
 
 const fixture = {
   type: "org.cloudevents.test",
diff --git a/test/integration/spec_03_tests.ts b/test/integration/spec_03_tests.ts
@@ -1,7 +1,7 @@
 import "mocha";
 import { expect } from "chai";
-import { CloudEvent, Version, ValidationError, Mode } from "../src";
-import Constants from "../src/constants";
+import { CloudEvent, Version, ValidationError, Mode } from "../../src";
+import Constants from "../../src/constants";
 
 const id = "97699ec2-a8d9-47c1-bfa0-ff7aa526f838";
 const type = "com.github.pull.create";
diff --git a/test/integration/spec_1_tests.ts b/test/integration/spec_1_tests.ts
@@ -1,8 +1,8 @@
 import "mocha";
 import { expect } from "chai";
-import { CloudEvent, Version, ValidationError } from "../src";
-import { asBase64 } from "../src/event/validation";
-import Constants from "../src/constants";
+import { CloudEvent, Version, ValidationError } from "../../src";
+import { asBase64 } from "../../src/event/validation";
+import Constants from "../../src/constants";
 
 const id = "97699ec2-a8d9-47c1-bfa0-ff7aa526f838";
 const type = "com.github.pull.create";
diff --git a/test/integration/utilities_test.ts b/test/integration/utilities_test.ts
@@ -1,6 +1,6 @@
 import "mocha";
 import { expect } from "chai";
-import { isStringOrThrow, equalsOrThrow, isBase64, asData } from "../src/event/validation/is";
+import { isStringOrThrow, equalsOrThrow, isBase64, asData } from "../../src/event/validation/is";
 
 describe("Utilities", () => {
   describe("isStringOrThrow", () => {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "conformance"]`
	`2`	`+ path = conformance`
	`3`	`+ url = [email protected]:cloudevents/conformance.git`