1 files changed, 8 insertions, 12 deletions
diff --git a/site/app/tests/views/developers/editversion.test.php b/site/app/tests/views/developers/editversion.test.php
index 1654b2e..ced5855 100644
--- a/site/app/tests/views/developers/editversion.test.php
+++ b/site/app/tests/views/developers/editversion.test.php
@@ -48,6 +48,8 @@ class DevelopersEditVersionTest extends WebTestHelper {
         $this->model->caching = false; // Make sure caching is off.
         $this->model->id = $this->id;
         $this->getAction('/developers/editversion/' . $this->id);
+
+        global $TestController;
     }
 
     function testRemoraPage() {
@@ -62,23 +64,17 @@ class DevelopersEditVersionTest extends WebTestHelper {
         //Check fields
         $this->model->useLang = 'en-US';
         $this->data = $this->model->find("Version.id={$this->id}", null , null , 2);
-        $this->assertFieldByName('data[Version][releasenotes][en-US]', htmlentities($this->data['Translation']['releasenotes']['string']),
-                                 'Version Notes (en-US) field populated: %s');
-
+        $this->assertFieldById('VersionReleasenotes_en_US', htmlentities($this->data['Translation']['releasenotes']['string']), 'Version Notes (en-US) field populated: %s');
+        
         $this->model->useLang = 'de';
         $this->data = $this->model->find("Version.id={$this->id}", null , null , 2);
-        $this->assertFieldByName('data[Version][releasenotes][de]', htmlentities($this->data['Translation']['releasenotes']['string']),
-                                 'Version Notes (de) field populated: %s');
+        $this->assertFieldById('VersionReleasenotes_de', htmlentities($this->data['Translation']['releasenotes']['string']), 'Version Notes (de) field populated: %s');
 
         $this->assertField('data[Version][approvalnotes]', $this->data['Version']['approvalnotes'], 'Version Approval Notes field populated: %s');
+        
+        $this->assertText($this->data['File'][0]['filename'].' ('.$this->data['File'][0]['size'].' KB)', 'File listing detected');
 
-        $this->assertText($this->data['File'][0]['size'].' KB', 'File size listing detected');
-
-        phpQuery::newDocument($this->_browser->getContent());
-        $platform = pq('#files-table option:first');
-        $this->assertAttrs($platform, array('value' => 1, 'selected' => 'selected'),
-                           'ALL platform is selected: %s');
-        $this->assertEqual($platform->text(), 'ALL', 'ALL platform is selected: %s');
+        $this->assertWantedPattern('/\<option value="1"  selected="selected"\>ALL\<\/option\>/', 'Correct platform selected');
     }
 }
 ?>