Merge pull request #2353 from Ragazzo/tests_improved

apps/basic/tests/_pages/ContactPage.php

@@ -13,10 +13,10 @@ class ContactPage extends BasePage
 	 */
 	public function submit(array $contactData)
 	{
-		$data = [];
-		foreach ($contactData as $name => $value) {
-			$data["ContactForm[$name]"] = $value;
+		foreach ($contactData as $field => $value) {
+			$inputType = ($field == 'body') ? 'textarea' : 'input';
+			$this->guy->fillField($inputType.'[name="ContactForm[' . $field . ']"]', $value);
 		}
-		$this->guy->submitForm('#contact-form', $data);
+		$this->guy->click('Submit','#contact-form');
 	}
 }

apps/basic/tests/_pages/LoginPage.php

@@ -14,9 +14,8 @@ class LoginPage extends BasePage
 	 */
 	public function login($username, $password)
 	{
-		$this->guy->submitForm('#login-form', [
-			'LoginForm[username]' => $username,
-			'LoginForm[password]' => $password,
-		]);
+		$this->guy->fillField('input[name="LoginForm[username]"]',$username);
+		$this->guy->fillField('input[name="LoginForm[password]"]',$password);
+		$this->guy->click('Login','#login-form');
 	}
 }