Stop using the Selenese impl provided by Orchestrator

diff --git a/it/it-tests/src/test/java/it/issue/IssueSearchTest.java b/it/it-tests/src/test/java/it/issue/IssueSearchTest.java
index a18d05fdf4478384710e57a004a2d4457f80d2ae..7611e5fa5dc1da28eae778f0e34846303d6fbac5 100644 (file)
--- a/it/it-tests/src/test/java/it/issue/IssueSearchTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueSearchTest.java
@@ -40,6 +40,7 @@ import org.sonar.wsclient.issue.IssueQuery;
 import org.sonar.wsclient.issue.Issues;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.client.issue.SearchWsRequest;
+import util.selenium.SeleneseTest;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -105,7 +106,7 @@ public class IssueSearchTest extends AbstractIssueTest {
   public void search_issues_by_components() {
     assertThat(
       search(IssueQuery.create().components("com.sonarsource.it.samples:multi-modules-sample:module_a:module_a1:src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo")).list())
-        .hasSize(34);
+      .hasSize(34);
     assertThat(search(IssueQuery.create().components("unknown")).list()).isEmpty();
   }
 
@@ -280,9 +281,9 @@ public class IssueSearchTest extends AbstractIssueTest {
   public void redirect_to_search_url_after_wrong_login() {
     // Force user authentication to check login on the issues search page
     setServerProperty(ORCHESTRATOR, "sonar.forceAuthentication", "true");
-    ORCHESTRATOR.executeSelenese(Selenese.builder().setHtmlTestsInClasspath("redirect_to_search_url_after_wrong_login",
+    new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("redirect_to_search_url_after_wrong_login",
       "/issue/IssueSearchTest/redirect_to_search_url_after_wrong_login.html" // SONAR-5659
-    ).build());
+    ).build()).runOn(ORCHESTRATOR);
   }
 
   @Test
@@ -312,9 +313,9 @@ public class IssueSearchTest extends AbstractIssueTest {
 
   @Test
   public void bulk_change() {
-    ORCHESTRATOR.executeSelenese(Selenese.builder().setHtmlTestsInClasspath("bulk_change",
+    new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("bulk_change",
       "/issue/IssueSearchTest/bulk_change.html"
-    ).build());
+    ).build()).runOn(ORCHESTRATOR);
   }
 
   private List<org.sonarqube.ws.Issues.Issue> searchByRuleKey(String... ruleKey) throws IOException {

diff --git a/it/it-tests/src/test/java/it/projectEvent/EventTest.java b/it/it-tests/src/test/java/it/projectEvent/EventTest.java
index 9a421a9999bb59b8630a39beea7392e507e1bdbe..963d0b9da2c722b78e2fdf1099fc9abd271e6536 100644 (file)
--- a/it/it-tests/src/test/java/it/projectEvent/EventTest.java
+++ b/it/it-tests/src/test/java/it/projectEvent/EventTest.java
@@ -22,12 +22,10 @@ package it.projectEvent;
 import com.google.common.collect.Lists;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import com.sonar.orchestrator.selenium.Selenese;
 import it.Category4Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.wsclient.services.Event;
 import org.sonar.wsclient.services.EventQuery;
@@ -35,6 +33,7 @@ import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsConnector;
 import org.sonarqube.ws.client.WsResponse;
 import util.ItUtils;
+import com.sonar.orchestrator.selenium.Selenese;
 import util.selenium.SeleneseTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -50,18 +49,6 @@ public class EventTest {
     orchestrator.resetData();
   }
 
-  @Test
-  @Ignore("Too many false-positives")
-  public void configuration_of_event() {
-    executeAnalysis();
-
-    orchestrator.executeSelenese(
-      Selenese.builder().setHtmlTestsInClasspath("events",
-        "/projectEvent/EventTest/create_event_with_special_character.html",
-        "/projectEvent/EventTest/no_events_widget_on_dir.html")
-        .build());
-  }
-
   @Test
   public void old_ws_events_does_not_allow_creating_events_on_modules() {
     SonarScanner sampleProject = SonarScanner.create(projectDir("shared/xoo-multi-modules-sample"));
@@ -92,19 +79,6 @@ public class EventTest {
         "/projectEvent/EventTest/create_delete_standard_event.html").build()).runOn(orchestrator);
   }
 
-  @Test
-  @Ignore("Too many false-positives")
-  public void event_widget() {
-    // first build, in the past
-    executeAnalysis("sonar.projectDate", "2016-01-01");
-    // Second build, today
-    executeAnalysis();
-
-    orchestrator.executeSelenese(
-      Selenese.builder().setHtmlTestsInClasspath("event-widget",
-        "/projectEvent/EventTest/show_events_using_filters.html").build());
-  }
-
   /**
    * SONAR-3308
    */

diff --git a/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java b/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java
index 44eef089527e8cbd4f9fa12048a651ed22b5ae82..6a1f48f3c1029bbf0c3ad1c1b4d96f1c62642993 100644 (file)
--- a/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java
+++ b/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java
@@ -25,6 +25,7 @@ import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
+import util.selenium.SeleneseTest;
 
 import static util.ItUtils.runProjectAnalysis;
 
@@ -48,7 +49,7 @@ public class HighlightingTest {
       // SONAR-4249 & SONAR-4250
       "/sourceCode/HighlightingTest/symbol-usages-highlighting.html"
       ).build();
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   // Check that E/S index is updated when file content is unchanged but plugin generates different syntax/symbol highlighting
@@ -58,13 +59,13 @@ public class HighlightingTest {
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("syntax-highlighting-v1",
       "/sourceCode/HighlightingTest/syntax-highlighting-v1.html").build();
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
 
     runProjectAnalysis(orchestrator, "highlighting/xoo-sample-with-highlighting-v2");
 
     selenese = Selenese.builder().setHtmlTestsInClasspath("syntax-highlighting-v2",
       "/sourceCode/HighlightingTest/syntax-highlighting-v2.html",
       "/sourceCode/HighlightingTest/symbol-usages-highlighting.html").build();
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 }

diff --git a/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java b/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java
index 7aca814487a965f11b01484775b9ca5eed16279c..258f2251b6560f8be3942cb650301ccac10e940d 100644 (file)
--- a/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java
+++ b/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java
@@ -22,18 +22,11 @@ package it.uiExtension;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import it.Category4Suite;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import util.selenium.SeleneseTest;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class UiExtensionsTest {
 
   @ClassRule
@@ -49,26 +42,7 @@ public class UiExtensionsTest {
   public void test_static_files() {
     new SeleneseTest(
       Selenese.builder().setHtmlTestsInClasspath("ui-static-files",
-        "/uiExtension/UiExtensionsTest/static-files.html"
-        ).build()).runOn(orchestrator);
-  }
-
-  /**
-   * SONAR-3555
-   */
-  @Test
-  public void content_type_of_static_files_is_set() throws Exception {
-    HttpClient httpclient = new DefaultHttpClient();
-    try {
-      HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/static/uiextensionsplugin/cute.jpg");
-      HttpResponse response = httpclient.execute(get);
-      assertThat(response.getLastHeader("Content-Type").getValue()).isEqualTo("image/jpeg");
-
-      EntityUtils.consume(response.getEntity());
-
-    } finally {
-      httpclient.getConnectionManager().shutdown();
-    }
+        "/uiExtension/UiExtensionsTest/static-files.html").build()).runOn(orchestrator);
   }
 
   /**
@@ -78,17 +52,7 @@ public class UiExtensionsTest {
   public void test_page_decoration() {
     new SeleneseTest(
       Selenese.builder().setHtmlTestsInClasspath("ui-page-decoration",
-        "/uiExtension/UiExtensionsTest/page-decoration.html"
-        ).build()).runOn(orchestrator);
-  }
-
-  @Test
-  public void test_ruby_extensions() {
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("ui-ruby-extensions",
-      "/uiExtension/UiExtensionsTest/ruby-rails-app.html",
-      "/uiExtension/UiExtensionsTest/ruby-rails-app-advanced.html"
-      ).build();
-    orchestrator.executeSelenese(selenese);
+        "/uiExtension/UiExtensionsTest/page-decoration.html").build()).runOn(orchestrator);
   }
 
   /**
@@ -98,8 +62,7 @@ public class UiExtensionsTest {
   public void test_resource_configuration_extension() {
     new SeleneseTest(
       Selenese.builder().setHtmlTestsInClasspath("resource-configuration-extension",
-        "/uiExtension/UiExtensionsTest/resource-configuration-extension.html"
-        ).build()).runOn(orchestrator);
+        "/uiExtension/UiExtensionsTest/resource-configuration-extension.html").build()).runOn(orchestrator);
   }
 
 }

diff --git a/it/it-tests/src/test/java/util/selenium/SeleneseTest.java b/it/it-tests/src/test/java/util/selenium/SeleneseTest.java
index bf84e6416d71753c52e8a129a1ad336dd9337f20..81866e86cc735d1b08c9f9b828e7db500666f287 100644 (file)
--- a/it/it-tests/src/test/java/util/selenium/SeleneseTest.java
+++ b/it/it-tests/src/test/java/util/selenium/SeleneseTest.java
@@ -159,6 +159,9 @@ public class SeleneseTest {
       case "assertLocation":
         assertLocation(param1);
         return this;
+      case "verifyHtmlSource":
+        verifyHtmlSource(param1);
+        return this;
       case "waitForElementPresent":
         waitForElementPresent(param1, param2);
         return this;
@@ -168,6 +171,9 @@ public class SeleneseTest {
       case "waitForVisible":
         waitForVisible(param1);
         return this;
+      case "waitForXpathCount":
+        waitForXpathCount(param1, Integer.parseInt(param2));
+        return this;
       case "assertValue":
       case "waitForValue":
       case "verifyValue":
@@ -198,7 +204,7 @@ public class SeleneseTest {
 
     url = replacePlaceholders(url);
 
-    URI uri = URI.create(url.replace(" ", "%20"));
+    URI uri = URI.create(url.replace(" ", "%20").replace("|", "%7C"));
     if (!uri.isAbsolute()) {
       url = baseUrl + url;
     }
@@ -407,6 +413,10 @@ public class SeleneseTest {
     find(selector).should().contain(text);
   }
 
+  private void waitForXpathCount(String selector, int expectedCount) {
+    assertThat(find(selector).stream().size()).isEqualTo(expectedCount);
+  }
+
   private void confirm(final String message) {
     System.out.println(" - confirm(" + message + ")");
 
@@ -422,6 +432,10 @@ public class SeleneseTest {
     assertThat(driver.getCurrentUrl()).matches(glob(urlPattern));
   }
 
+  private void verifyHtmlSource(String expect) {
+    assertThat(driver.getPageSource()).matches(glob(expect));
+  }
+
   private String replacePlaceholders(String text) {
     for (Map.Entry<String, String> entry : variables.entrySet()) {
       text = text.replace("${" + entry.getKey() + "}", entry.getValue());

diff --git a/it/it-tests/src/test/resources/issue/IssueSearchTest/bulk_change.html b/it/it-tests/src/test/resources/issue/IssueSearchTest/bulk_change.html
index 5b8a928627bc60caa31a523773a5ec6e453f0ebf..c390c02d1059c42945583790d93816be32e654a5 100644 (file)
--- a/it/it-tests/src/test/resources/issue/IssueSearchTest/bulk_change.html
+++ b/it/it-tests/src/test/resources/issue/IssueSearchTest/bulk_change.html
@@ -17,6 +17,11 @@
        <td>/sessions/new</td>
        <td></td>
 </tr>
+<tr>
+       <td>waitForText</td>
+       <td>content</td>
+       <td>*Log In to SonarQube*</td>
+</tr>
 <tr>
        <td>type</td>
        <td>id=login</td>
@@ -32,15 +37,20 @@
        <td>commit</td>
        <td></td>
 </tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>css=.js-user-authenticated</td>
+       <td></td>
+</tr>
 <tr>
        <td>open</td>
        <td>/issues</td>
        <td></td>
 </tr>
 <tr>
-       <td>waitForText</td>
-       <td>css=.js-issue-transition</td>
-       <td>*Open*</td>
+       <td>waitForElementPresent</td>
+       <td>css=.search-navigator-workspace-list .issue</td>
+       <td></td>
 </tr>
 <tr>
        <td>waitForElementPresent</td>

diff --git a/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html b/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html
deleted file mode 100644 (file)
index c191a26..0000000
--- a/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>create_event_with_special_character</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <thead>
-  <tr>
-    <td rowspan="1" colspan="3">create_event_with_special_character</td>
-  </tr>
-  </thead>
-  <tbody>
-  <tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/sessions/login</td>
-       <td></td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>login</td>
-       <td>admin</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>password</td>
-       <td>admin</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>commit</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>css=.js-user-authenticated</td>
-       <td></td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/project/history?id=sample</td>
-       <td></td>
-</tr>
-  <tr>
-         <td>waitForElementPresent</td>
-         <td>link=Create</td>
-         <td></td>
-  </tr>
-<tr>
-       <td>click</td>
-       <td>link=Create</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>create_event_name_0</td>
-       <td></td>
-</tr>
-<tr>
-       <td>store</td>
-       <td>évènement</td>
-       <td>eventName</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>create_event_name_0</td>
-       <td>${eventName}</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>create_save_event_0</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>infomsg</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>infomsg</td>
-       <td>Event &quot;${eventName}&quot; was created.</td>
-</tr>
-<tr>
-       <td>assertElementPresent</td>
-       <td>//td[text()='${eventName}']</td>
-       <td></td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>

diff --git a/it/it-tests/src/test/resources/projectEvent/EventTest/no_events_widget_on_dir.html b/it/it-tests/src/test/resources/projectEvent/EventTest/no_events_widget_on_dir.html
deleted file mode 100644 (file)
index 86cfc86..0000000
--- a/it/it-tests/src/test/resources/projectEvent/EventTest/no_events_widget_on_dir.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>no_events_widget_on_dir</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <thead>
-  <tr>
-    <td rowspan="1" colspan="3">no_events_widget_on_package</td>
-  </tr>
-  </thead>
-  <tbody>
-  <tr>
-       <td>open</td>
-       <td>/widget?id=events&amp;resource=sample</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>css=tr.event</td>
-       <td></td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/widget?id=events&amp;resource=sample%3Asrc%2Fmain%2Fxoo%2Fsample</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementNotPresent</td>
-       <td>css=tr.event</td>
-       <td></td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>

diff --git a/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html b/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html
deleted file mode 100644 (file)
index ca90b80..0000000
--- a/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>show_events_using_filters</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <thead>
-  <tr>
-    <td rowspan="1" colspan="3">show_events_using_filters</td>
-  </tr>
-  </thead>
-  <tbody>
-  <tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/sessions/login</td>
-       <td></td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>login</td>
-       <td>admin</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>password</td>
-       <td>admin</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>commit</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>css=.js-user-authenticated</td>
-       <td></td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/project/history?id=sample</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>create_event_1_change</td>
-       <td></td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>id=create_event_name_1</td>
-       <td>Hello you</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>id=create_save_event_1</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>content</td>
-       <td>*Event &quot;Hello you&quot; was created.*1.0-SNAPSHOT*Last*Hello you*</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/widget?id=events&amp;resource=sample</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>body</td>
-       <td>*Events*</td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>block_1</td>
-       <td>*Events*Version*1.0-SNAPSHOT*Other*Hello you*</td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>id=select_category_1</td>
-       <td>label=Quality Profile</td>
-</tr>
-<tr>
-       <td>assertNotText</td>
-       <td>block_1</td>
-       <td>*Version*1.0-SNAPSHOT*Other*Hello you*</td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>id=select_category_1</td>
-       <td>label=Other</td>
-</tr>
-<tr>
-       <td>assertNotText</td>
-       <td>block_1</td>
-       <td>*Version*1.0-SNAPSHOT*</td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>id=select_category_1</td>
-       <td>label=Version</td>
-</tr>
-<tr>
-       <td>assertNotText</td>
-       <td>block_1</td>
-       <td>*Other*Hello you*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>

diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
index 368c3bdf58e4fbe44b16584f19df758d99544cc2..7a1e36cf8160e6496639bae63fa8dfce3d0d0e99 100644 (file)
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
@@ -23,11 +23,6 @@
         <td>css=.source-line</td>
         <td></td>
     </tr>
-    <tr>
-        <td>storeHtmlSource</td>
-        <td></td>
-        <td></td>
-    </tr>
     <tr>
         <td>verifyHtmlSource</td>
         <td>glob:*&lt;span class="k"&gt;package&lt;/span&gt;*</td>

diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
index 57c535a10d30bab4a5bf740fbe63299be51b3c85..7f473dd9e4362fe6c47553ff461dc47c784f06be 100644 (file)
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
@@ -23,11 +23,6 @@
         <td>css=.source-line</td>
         <td></td>
     </tr>
-    <tr>
-        <td>storeHtmlSource</td>
-        <td></td>
-        <td></td>
-    </tr>
     <tr>
         <td>verifyHtmlSource</td>
         <td>glob:*&lt;span class="k"&gt;package&lt;/span&gt;*</td>

diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
index 24d0ac63903cbe045dd1a5ff0a836b3a5560cdc9..53e4602a9786566b64259ecf959ad1b1e2af368a 100644 (file)
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
+++ b/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
@@ -23,11 +23,6 @@
         <td>css=.source-line</td>
         <td></td>
     </tr>
-    <tr>
-        <td>storeHtmlSource</td>
-        <td></td>
-        <td></td>
-    </tr>
     <tr>
         <td>verifyHtmlSource</td>
         <td>glob:*&lt;span class="k"&gt;package&lt;/span&gt;*</td>

diff --git a/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/ruby-rails-app-advanced.html b/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/ruby-rails-app-advanced.html
deleted file mode 100644 (file)
index 0553d3d..0000000
--- a/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/ruby-rails-app-advanced.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>ruby-rails-app</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/fake_app/advanced</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>fake-div</td>
-    <td>*This page requests database and use RoR partial*</td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>fake-div</td>
-    <td>*Database connection OK*</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>

diff --git a/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/ruby-rails-app.html b/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/ruby-rails-app.html
deleted file mode 100644 (file)
index c6500b1..0000000
--- a/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/ruby-rails-app.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title>ruby-rails-app</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-  <tbody>
-  <tr>
-    <td>open</td>
-    <td>/fake_app</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>fake-app</td>
-    <td>Fake application</td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>helper-test</td>
-    <td>message generated by helper</td>
-  </tr>
-  </tbody>
-</table>
-</body>
-</html>