Merge branch 'MTDSA-1244'

Chandrashekhar Korivi · Chandrashekhar Korivi · commit 97558fde8d4e · 2017-11-29T16:41:52.000Z
diff --git a/app/uk/gov/hmrc/vatapi/config/microserviceGlobal.scala b/app/uk/gov/hmrc/vatapi/config/microserviceGlobal.scala
@@ -189,7 +189,7 @@ object MicroserviceGlobal
   private def enabledFilters: Seq[EssentialFilter] = Seq.empty
 
   override def microserviceFilters: Seq[EssentialFilter] =
-    Seq(HeaderValidatorFilter, EmptyResponseFilter, SetContentTypeFilter, SetXContentTypeOptionsFilter) ++ enabledFilters ++
+    Seq(SetXContentTypeOptionsFilter, HeaderValidatorFilter, EmptyResponseFilter, SetContentTypeFilter) ++ enabledFilters ++
       defaultMicroserviceFilters
 
   override def onStart(app: Application): Unit = {
diff --git a/func/uk/gov/hmrc/vatapi/resources/SetXContentTypeOptionsFilterSpec.scala b/func/uk/gov/hmrc/vatapi/resources/SetXContentTypeOptionsFilterSpec.scala
@@ -53,6 +53,16 @@ class SetXContentTypeOptionsFilterSpec extends BaseFunctionalSpec {
         .statusIs(404)
         .responseContainsHeader(SetXContentTypeOptionsFilter.xContentTypeOptionsHeader, "nosniff".r)
     }
+
+    "be applied for api definition without accept header" in {
+      given()
+        .when()
+        .get("/api/definition")
+        .withoutAcceptHeader()
+        .thenAssertThat()
+        .statusIs(200)
+        .responseContainsHeader(SetXContentTypeOptionsFilter.xContentTypeOptionsHeader, "nosniff".r)
+    }
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,16 @@ class SetXContentTypeOptionsFilterSpec extends BaseFunctionalSpec {`
`53`	`53`	`.statusIs(404)`
`54`	`54`	`.responseContainsHeader(SetXContentTypeOptionsFilter.xContentTypeOptionsHeader, "nosniff".r)`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ "be applied for api definition without accept header" in {`
	`58`	`+ given()`
	`59`	`+ .when()`
	`60`	`+ .get("/api/definition")`
	`61`	`+ .withoutAcceptHeader()`
	`62`	`+ .thenAssertThat()`
	`63`	`+ .statusIs(200)`
	`64`	`+ .responseContainsHeader(SetXContentTypeOptionsFilter.xContentTypeOptionsHeader, "nosniff".r)`
	`65`	`+ }`
`56`	`66`	`}`
`57`	`67`
`58`	`68`	`}`