From 5f4c9dd068bc99fecd2eaf19c7d4f712ee5df003 Mon Sep 17 00:00:00 2001
From: Smita Kumari <kumarismita62@gmail.com>
Date: Sun, 20 Jul 2014 22:19:50 +0530
Subject: [PATCH] selenium test updated for 1NF

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
---
 .../selenium/PmaSeleniumNormalizationTest.php | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/test/selenium/PmaSeleniumNormalizationTest.php b/test/selenium/PmaSeleniumNormalizationTest.php
index 9a26427d5d..3b7582dc0c 100644
--- a/test/selenium/PmaSeleniumNormalizationTest.php
+++ b/test/selenium/PmaSeleniumNormalizationTest.php
@@ -132,7 +132,12 @@ class PMA_SeleniumNormalizationTest extends PMA_SeleniumBase
         $this->assertContains("Primary key already exists.", $text);
         $this->waitForElement(
             "byXPath",
-            "//legend[contains(., 'Step 1.3 Remove redundant columns')]"
+            "//legend[contains(., 'Step 1.3 Move repeating groups')]"
+        );
+        $this->byCssSelector('input[value="No repeating group"]')->click();
+        $this->waitForElement(
+            "byXPath",
+            "//legend[contains(., 'Step 1.4 Remove redundant columns')]"
         );
         $this->assertTrue(
             $this->isElementPresent(
@@ -149,30 +154,8 @@ class PMA_SeleniumNormalizationTest extends PMA_SeleniumBase
                 'byCssSelector', '#extra input[value=id][type=checkbox]'
             )
         );
-        $this->byCssSelector('#extra input[value=id][type=checkbox]')->click();
+        $this->byCssSelector('#extra input[value=val][type=checkbox]')->click();
         $this->byCssSelector("#removeRedundant")->click();
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Step 1.2 Have a primary key')]"
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byLinkText', 'Add a primary key on existing column(s)'
-            )
-        );
-        $this->byId('addNewPrimary')->click();
-        $this->waitForElement("byId", "table_columns");
-        $this->byId('saveNewPrimary')->click();
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Step 1.3 Remove redundant columns')]"
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#extra input[value=test_table_id][type=checkbox]'
-            )
-        );
-        $this->byCssSelector('input[value="No redundant column"]')->click();
         $this->waitForElement(
             "byXPath",
             "//legend[contains(., 'End of step')]"