Move table tag to the form

Ported from: * c34ea9c It was moved because HTML was not valid.
OXID-eSales · Jan 17, 2017 · 289e879 · 289e879
1 parent 4d08366
commit 289e879
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/source/Application/views/admin/tpl/order_downloads.tpl b/source/Application/views/admin/tpl/order_downloads.tpl
@@ -12,13 +12,13 @@
     <input type="hidden" name="cl" value="order_downloads">
 </form>
 
-<table cellspacing="0" cellpadding="0" border="0" width="98%">
 <form name="search" id="search" action="[{$oViewConf->getSelfLink()}]" method="post">
     [{$oViewConf->getHiddenSid()}]
     <input type="hidden" name="cl" value="order_downloads">
     <input type="hidden" name="oxid" value="[{$oxid}]">
     <input type="hidden" name="fnc" value="resetDownloadLink">
     <input type="hidden" name="oxorderfileid" value="[{$oxid}]">
+<table cellspacing="0" cellpadding="0" border="0" width="98%">
 <tr>
     [{block name="admin_order_downloads_header"}]
         <td class="listheader" height="15">&nbsp;&nbsp;&nbsp;[{oxmultilang ident="GENERAL_ITEMNR"}]</td>

diff --git a/tests/Acceptance/Admin/FunctionalityInAdminTest.php b/tests/Acceptance/Admin/FunctionalityInAdminTest.php
@@ -88,14 +88,16 @@ public function testDownloadableFiles()
         $this->loginAdmin("Administer Orders", "Orders");
         $this->clickAndWaitFrame("link=12", "edit");
         $this->openTab("Downloads");
-        $this->assertEquals("1002-1", $this->getText("//div[2]/table/tbody/tr[2]/td[1]"));
-        $this->assertEquals("Test product 2 [EN] šÄßüл", $this->getText("//div[2]/table/tbody/tr[2]/td[2]"));
-        $this->assertEquals("testFile3", $this->getText("//div[2]/table/tbody/tr[2]/td[3]"));
-        $this->assertEquals("0000-00-00 00:00:00", $this->getText("//div[2]/table/tbody/tr[2]/td[4]"));
-        $this->assertEquals("0000-00-00 00:00:00", $this->getText("//div[2]/table/tbody/tr[2]/td[5]"));
-        $this->assertEquals("0", $this->getText("//div[2]/table/tbody/tr[2]/td[6]"));
-        $this->assertEquals("20", $this->getText("//div[2]/table/tbody/tr[2]/td[7]"));
-        $this->assertEquals("0", $this->getText("//div[2]/table/tbody/tr[2]/td[9]"));
+        $this->getElement("//tr[@id='file.1']/td[1]");
+        $firstDownloadableProductLocator = "//tr[@id='file.1']";
+        $this->assertEquals("1002-1", $this->getText("{$firstDownloadableProductLocator}/td[1]"));
+        $this->assertEquals("Test product 2 [EN] šÄßüл", $this->getText("$firstDownloadableProductLocator/td[2]"));
+        $this->assertEquals("testFile3", $this->getText("$firstDownloadableProductLocator/td[3]"));
+        $this->assertEquals("0000-00-00 00:00:00", $this->getText("$firstDownloadableProductLocator/td[4]"));
+        $this->assertEquals("0000-00-00 00:00:00", $this->getText("$firstDownloadableProductLocator/td[5]"));
+        $this->assertEquals("0", $this->getText("$firstDownloadableProductLocator/td[6]"));
+        $this->assertEquals("20", $this->getText("$firstDownloadableProductLocator/td[7]"));
+        $this->assertEquals("0", $this->getText("$firstDownloadableProductLocator/td[9]"));
         $this->openTab("Main");
         $this->click("link=Current Date");
         $this->clickAndWait("saveFormButton");
@@ -117,11 +119,11 @@ public function testDownloadableFiles()
         $this->loginAdmin("Administer Orders", "Orders");
         $this->clickAndWaitFrame("link=12", "edit");
         $this->openTab("Downloads");
-        $this->assertEquals("1002-1", $this->getText("//div[2]/table/tbody/tr[2]/td[1]"));
-        $this->assertEquals("Test product 2 [EN] šÄßüл", $this->getText("//div[2]/table/tbody/tr[2]/td[2]"));
-        $this->assertEquals("testFile3", $this->getText("//div[2]/table/tbody/tr[2]/td[3]"));
-        $this->assertEquals("20", $this->getText("//div[2]/table/tbody/tr[2]/td[7]"));
-        $this->assertEquals("0", $this->getText("//div[2]/table/tbody/tr[2]/td[9]"));
+        $this->assertEquals("1002-1", $this->getText("$firstDownloadableProductLocator/td[1]"));
+        $this->assertEquals("Test product 2 [EN] šÄßüл", $this->getText("$firstDownloadableProductLocator/td[2]"));
+        $this->assertEquals("testFile3", $this->getText("$firstDownloadableProductLocator/td[3]"));
+        $this->assertEquals("20", $this->getText("$firstDownloadableProductLocator/td[7]"));
+        $this->assertEquals("0", $this->getText("$firstDownloadableProductLocator/td[9]"));
     }
 
     /**