Merge branch 'MC-1405' of github.com:magento-trigger/magento2-page-builder into MC-1405

nathanjosiah · nathanjosiah · commit 0bbfa1465062 · 2018-08-16T09:59:10.000-05:00
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php
@@ -26,8 +26,9 @@ public function testRender()
         );
         $result = $blockRenderer->render(['block_id' => $cmsBlock->getId()]);
         $this->assertArrayHasKey('content', $result);
-        $this->assertNotContains('<script>', $result['content']);
-        $this->assertContains('<p>Config value: "http://example.com/".</p>', $result['content']);
-        $this->assertContains('<p>Custom variable: "HTML Value".</p>', $result['content']);
+        $content = $result['content'];
+        $this->assertNotContains('<script>', $content);
+        $this->assertContains('<p>Config value: "http://example.com/".</p>', $content);
+        $this->assertContains('<p>Custom variable: "HTML Value".</p>', $content);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,9 @@ public function testRender()`
`26`	`26`	`);`
`27`	`27`	`$result = $blockRenderer->render(['block_id' => $cmsBlock->getId()]);`
`28`	`28`	`$this->assertArrayHasKey('content', $result);`
`29`		`- $this->assertNotContains('<script>', $result['content']);`
`30`		`- $this->assertContains('<p>Config value: "http://example.com/".</p>', $result['content']);`
`31`		`- $this->assertContains('<p>Custom variable: "HTML Value".</p>', $result['content']);`
	`29`	`+ $content = $result['content'];`
	`30`	`+ $this->assertNotContains('<script>', $content);`
	`31`	`+ $this->assertContains('<p>Config value: "http://example.com/".</p>', $content);`
	`32`	`+ $this->assertContains('<p>Custom variable: "HTML Value".</p>', $content);`
`32`	`33`	`}`
`33`	`34`	`}`