MAGETWO-16192: Security: Clickjacking solution - introduce X-Frame-Options

Dale Sikkema · Dale Sikkema · commit f0da50c4d1d3 · 2015-06-17T11:22:09.000-05:00
- update unit tests
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Module/ConfigOptionsListTest.php
@@ -82,8 +82,9 @@ public function testCreateOptions()
         $this->generator->expects($this->once())->method('createDefinitionsConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createDbConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createResourceConfig')->willReturn($configDataMock);
+        $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $configData = $this->object->createConfig([], $this->deploymentConfig);
-        $this->assertEquals(6, count($configData));
+        $this->assertEquals(7, count($configData));
     }
 
     public function testCreateOptionsWithOptionalNull()
@@ -95,7 +96,8 @@ public function testCreateOptionsWithOptionalNull()
         $this->generator->expects($this->once())->method('createDefinitionsConfig')->willReturn(null);
         $this->generator->expects($this->once())->method('createDbConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createResourceConfig')->willReturn($configDataMock);
+        $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $configData = $this->object->createConfig([], $this->deploymentConfig);
-        $this->assertEquals(5, count($configData));
+        $this->assertEquals(6, count($configData));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,9 @@ public function testCreateOptions()`
`82`	`82`	`$this->generator->expects($this->once())->method('createDefinitionsConfig')->willReturn($configDataMock);`
`83`	`83`	`$this->generator->expects($this->once())->method('createDbConfig')->willReturn($configDataMock);`
`84`	`84`	`$this->generator->expects($this->once())->method('createResourceConfig')->willReturn($configDataMock);`
	`85`	`+ $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);`
`85`	`86`	`$configData = $this->object->createConfig([], $this->deploymentConfig);`
`86`		`- $this->assertEquals(6, count($configData));`
	`87`	`+ $this->assertEquals(7, count($configData));`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`public function testCreateOptionsWithOptionalNull()`
`@@ -95,7 +96,8 @@ public function testCreateOptionsWithOptionalNull()`
`95`	`96`	`$this->generator->expects($this->once())->method('createDefinitionsConfig')->willReturn(null);`
`96`	`97`	`$this->generator->expects($this->once())->method('createDbConfig')->willReturn($configDataMock);`
`97`	`98`	`$this->generator->expects($this->once())->method('createResourceConfig')->willReturn($configDataMock);`
	`99`	`+ $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);`
`98`	`100`	`$configData = $this->object->createConfig([], $this->deploymentConfig);`
`99`		`- $this->assertEquals(5, count($configData));`
	`101`	`+ $this->assertEquals(6, count($configData));`
`100`	`102`	`}`
`101`	`103`	`}`