Commit 55d6d7f2 authored by Alexander Makarov's avatar Alexander Makarov Committed by GitHub

Fixed tests to pass against latest framework release (#160)

parent 145235ff
...@@ -28,12 +28,11 @@ class ActiveFieldTest extends TestCase ...@@ -28,12 +28,11 @@ class ActiveFieldTest extends TestCase
protected function setUp() protected function setUp()
{ {
parent::setUp();
// dirty way to have Request object not throwing exception when running testHomeLinkNull() // dirty way to have Request object not throwing exception when running testHomeLinkNull()
$_SERVER['SCRIPT_FILENAME'] = "index.php"; $_SERVER['SCRIPT_FILENAME'] = "index.php";
$_SERVER['SCRIPT_NAME'] = "index.php"; $_SERVER['SCRIPT_NAME'] = "index.php";
$this->mockWebApplication(); parent::setUp();
$this->helperModel = new DynamicModel(['attributeName']); $this->helperModel = new DynamicModel(['attributeName']);
ob_start(); ob_start();
...@@ -53,7 +52,7 @@ class ActiveFieldTest extends TestCase ...@@ -53,7 +52,7 @@ class ActiveFieldTest extends TestCase
$expectedHtml = <<<HTML $expectedHtml = <<<HTML
<div class="form-group field-dynamicmodel-attributename"> <div class="form-group field-dynamicmodel-attributename">
<label class="control-label" for="dynamicmodel-attributename">Attribute Name</label> <label class="control-label">Attribute Name</label>
<input type="hidden" name="DynamicModel[attributeName]" value=""><div id="dynamicmodel-attributename"><div class="radio"><label><input type="radio" name="DynamicModel[attributeName]" value="1"> name1</label></div> <input type="hidden" name="DynamicModel[attributeName]" value=""><div id="dynamicmodel-attributename"><div class="radio"><label><input type="radio" name="DynamicModel[attributeName]" value="1"> name1</label></div>
<div class="radio"><label><input type="radio" name="DynamicModel[attributeName]" value="2"> name2</label></div></div> <div class="radio"><label><input type="radio" name="DynamicModel[attributeName]" value="2"> name2</label></div></div>
...@@ -69,7 +68,7 @@ HTML; ...@@ -69,7 +68,7 @@ HTML;
$expectedHtml = <<<HTML $expectedHtml = <<<HTML
<div class="form-group field-dynamicmodel-attributename"> <div class="form-group field-dynamicmodel-attributename">
<label class="control-label" for="dynamicmodel-attributename">Attribute Name</label> <label class="control-label">Attribute Name</label>
<input type="hidden" name="DynamicModel[attributeName]" value=""><div id="dynamicmodel-attributename"><div class="checkbox"><label><input type="checkbox" name="DynamicModel[attributeName][]" value="1"> name1</label></div> <input type="hidden" name="DynamicModel[attributeName]" value=""><div id="dynamicmodel-attributename"><div class="checkbox"><label><input type="checkbox" name="DynamicModel[attributeName][]" value="1"> name1</label></div>
<div class="checkbox"><label><input type="checkbox" name="DynamicModel[attributeName][]" value="2"> name2</label></div></div> <div class="checkbox"><label><input type="checkbox" name="DynamicModel[attributeName][]" value="2"> name2</label></div></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment