Fixing Ruby formatter. Fixes issue 6129

paymand · Oct 21, 2013 · 7d3fdc4 · 7d3fdc4
1 parent 5fd112b
commit 7d3fdc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ide/plugins/ruby-format/src/content/formats/ruby-wd-rspec.js b/ide/plugins/ruby-format/src/content/formats/ruby-wd-rspec.js
@@ -331,14 +331,14 @@ this.options = {
   footer: "  end\n" +
           "  \n" +
           "  def element_present?(how, what)\n" +
-          "    @driver.find_element(how, what)\n" +
+          "    ${receiver}.find_element(how, what)\n" +
           "    true\n" +
           "  rescue Selenium::WebDriver::Error::NoSuchElementError\n" +
           "    false\n" +
           "  end\n" +
           "  \n" +
           "  def alert_present?()\n" +
-          "    @driver.switch_to.alert\n" +
+          "    ${receiver}.switch_to.alert\n" +
           "    true\n" +
           "  rescue Selenium::WebDriver::Error::NoAlertPresentError\n" +
           "    false\n" +
@@ -351,7 +351,7 @@ this.options = {
           "  end\n" +
           "  \n" +
           "  def close_alert_and_get_its_text(how, what)\n" +
-          "    alert = @driver.switch_to().alert()\n" +
+          "    alert = ${receiver}.switch_to().alert()\n" +
           "    alert_text = alert.text\n" +
           "    if (@accept_next_alert) then\n" +
           "      alert.accept()\n" +

diff --git a/ide/plugins/ruby-format/src/content/formats/ruby-wd.js b/ide/plugins/ruby-format/src/content/formats/ruby-wd.js
@@ -314,14 +314,14 @@ this.options = {
   footer: "  end\n" +
           "  \n" +
           "  def element_present?(how, what)\n" +
-          "    @driver.find_element(how, what)\n" +
+          "    ${receiver}.find_element(how, what)\n" +
           "    true\n" +
           "  rescue Selenium::WebDriver::Error::NoSuchElementError\n" +
           "    false\n" +
           "  end\n" +
           "  \n" +
           "  def alert_present?()\n" +
-          "    @driver.switch_to.alert\n" +
+          "    ${receiver}.switch_to.alert\n" +
           "    true\n" +
           "  rescue Selenium::WebDriver::Error::NoAlertPresentError\n" +
           "    false\n" +
@@ -334,7 +334,7 @@ this.options = {
           "  end\n" +
           "  \n" +
           "  def close_alert_and_get_its_text(how, what)\n" +
-          "    alert = @driver.switch_to().alert()\n" +
+          "    alert = ${receiver}.switch_to().alert()\n" +
           "    alert_text = alert.text\n" +
           "    if (@accept_next_alert) then\n" +
           "      alert.accept()\n" +