move integration tests into root project

Nike-Inc · Oct 2, 2017 · 22ae461 · 22ae461
1 parent ea16e3e
commit 22ae461
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ scala:
   - 2.12.3
 
 script:
-  - "sbt +test +integration-tests/test"
-  - "sbt clean coverage test integration-tests/test coverageReport"
+  - "sbt +test"
+  - "sbt clean coverage test coverageReport"
   - "sbt coverageAggregate"
 after_success:
   - "sbt coveralls"
diff --git a/build.sbt b/build.sbt
@@ -73,6 +73,3 @@ lazy val root = (project in file("."))
   .settings(
     testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", new File(target.value, "/test-reports-html").getAbsolutePath)
   )
-
-lazy val `integration-tests` = (project in file("integration-tests"))
-  .dependsOn(core, swagger, html)
diff --git a/...egrationtests/swagger/basic/expected.json → ...egrationtests/swagger/basic/expected.json b/...egrationtests/swagger/basic/expected.json → ...egrationtests/swagger/basic/expected.json
diff --git a/...er/basic/requests.invalidGetResponse.json → ...er/basic/requests.invalidGetResponse.json b/...er/basic/requests.invalidGetResponse.json → ...er/basic/requests.invalidGetResponse.json
diff --git a/...sts/swagger/basic/requests.unMatched.json → ...sts/swagger/basic/requests.unMatched.json b/...sts/swagger/basic/requests.unMatched.json → ...sts/swagger/basic/requests.unMatched.json
diff --git a/...ests/swagger/basic/requests.validGet.json → ...ests/swagger/basic/requests.validGet.json b/...ests/swagger/basic/requests.validGet.json → ...ests/swagger/basic/requests.validGet.json
diff --git a/...tegrationtests/swagger/basic/swagger.yaml → ...tegrationtests/swagger/basic/swagger.yaml b/...tegrationtests/swagger/basic/swagger.yaml → ...tegrationtests/swagger/basic/swagger.yaml
diff --git a/...iggler/integrationtests/SwaggerSpec.scala → ...iggler/integrationtests/SwaggerSpec.scala b/...iggler/integrationtests/SwaggerSpec.scala → ...iggler/integrationtests/SwaggerSpec.scala