- Start your server in a different environment or see <%= readme_path %> - for information regarding how to change this behavior. -
-END - end +class SwitchEnvironmentController < ActionController::Base + def index + readme_path = File.expand_path File.join(File.dirname(__FILE__), '..', 'README') + render :status => 500, :locals => {:readme_path => readme_path }, :inline => <+ Start your server in a different environment or see <%= readme_path %> + for information regarding how to change this behavior. +
+END + end end \ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb b/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb index 4e178536..1a66da7d 100644 --- a/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb +++ b/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb @@ -1,9 +1,8 @@ -module SeleniumHelper - include SeleniumOnRails::SuiteRenderer - include SeleniumOnRails::FixtureLoader - - def test_case_name filename - File.basename(filename).sub(/\..*/,'').humanize - end - -end +module SeleniumHelper + include SeleniumOnRails::SuiteRenderer + include SeleniumOnRails::FixtureLoader + + def test_case_name filename + File.basename(filename).sub(/\..*/,'').humanize + end +end diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb index 365d0034..6b91847b 100644 --- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb +++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb @@ -1,11 +1,11 @@ -module SeleniumOnRails # :nodoc -end - -require 'selenium_on_rails/selenese' -require 'selenium_on_rails/test_builder' -require 'selenium_on_rails/rselenese' -require 'selenium_on_rails/suite_renderer' -require 'selenium_on_rails/paths' -require 'selenium_on_rails/fixture_loader' -require 'selenium_on_rails/partials_support' -require 'selenium_on_rails/renderer' +module SeleniumOnRails # :nodoc +end + +require 'selenium_on_rails/selenese' +require 'selenium_on_rails/test_builder' +require 'selenium_on_rails/rselenese' +require 'selenium_on_rails/suite_renderer' +require 'selenium_on_rails/paths' +require 'selenium_on_rails/fixture_loader' +require 'selenium_on_rails/partials_support' +require 'selenium_on_rails/renderer' diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb index 9f1d106b..a1130589 100644 --- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb +++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb @@ -1,210 +1,214 @@ -require File.dirname(__FILE__) + '/paths' -require File.dirname(__FILE__) + '/../selenium_on_rails_config' -require 'net/http' -require 'tempfile' - - -def c(var, default = nil) SeleniumOnRailsConfig.get var, default end -def c_b(var, default = nil) SeleniumOnRailsConfig.get(var, default) { yield } end - -BROWSERS = c :browsers, {} -REUSE_EXISTING_SERVER = c :reuse_existing_server, true -START_SERVER = c :start_server, false #TODO can't get it to work reliably on Windows, perhaps it's just on my computer, but I leave it off by default for now -HOST = c :host, 'localhost' -PORTS = c(:port_start, 3000)..c(:port_end, 3005) -TEST_RUNNER_URL = c :test_runner_url, '/selenium/TestRunner.html' -MAX_BROWSER_DURATION = c :max_browser_duration, 2*60 -MULTI_WINDOW = c :multi_window, false -SERVER_COMMAND = c_b :server_command do - server_path = File.expand_path(File.dirname(__FILE__) + '/../../../../../script/server') - if RUBY_PLATFORM =~ /mswin/ - "ruby #{server_path} -p %d -e test > NUL 2>&1" - else - # don't use redirects to /dev/nul since it makes the fork return wrong pid - # see UnixSubProcess - "#{server_path} -p %d -e test" - end -end - -module SeleniumOnRails - class AcceptanceTestRunner - include SeleniumOnRails::Paths - - def run - raise 'no browser specified, edit/create config.yml' if BROWSERS.empty? - start_server - has_error = false - begin - BROWSERS.each_pair do |browser, path| - log_file = start_browser browser, path - wait_for_completion log_file - stop_browser - result = YAML::load_file log_file - print_result result - has_error ||= result['numTestFailures'].to_i > 0 - File.delete log_file unless has_error - end - rescue - stop_server - raise - end - stop_server - raise 'Test failures' if has_error - end - - private - def start_server - PORTS.each do |p| - @port = p - case server_check - when :success - return if REUSE_EXISTING_SERVER - next - when Fixnum - next - when :no_response - next unless START_SERVER - do_start_server - return - end - end - raise START_SERVER ? 'failed to start server': 'failed to find existing server, run script/server -e test' - end - - def do_start_server - puts 'Starting server' - @server = start_subprocess(format(SERVER_COMMAND, @port)) - while true - print '.' - r = server_check - if r == :success - puts - return - end - raise "server returned error: #{r}" if r.instance_of? Fixnum - sleep 3 - end - end - - def server_check - begin - res = Net::HTTP.get_response HOST, TEST_RUNNER_URL, @port - return :success if (200..399).include? res.code.to_i - return res.code.to_i - rescue Errno::ECONNREFUSED - return :no_response - end - end - - def stop_server - return unless defined? @server - puts - @server.stop 'server' - end - - def start_browser browser, path - puts - puts "Starting #{browser}" - log = log_file browser - command = "\"#{path}\" \"http://#{HOST}:#{@port}#{TEST_RUNNER_URL}?test=tests&auto=true&resultsUrl=postResults/#{log}&multiWindow=#{MULTI_WINDOW}\"" - @browser = start_subprocess command - log_path log - end - - def stop_browser - @browser.stop 'browser' - end - - def start_subprocess command - if RUBY_PLATFORM =~ /mswin/ - SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess.new command - elsif RUBY_PLATFORM =~ /darwin/i && command =~ /safari/i - SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess.new command - else - SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess.new command - end - end - - def log_file browser - (0..100).each do |i| - name = browser + (i==0 ? '' : "(#{i})") + '.yml' - return name unless File.exist?(log_path(name)) - end - raise 'there are way too many files in the log directory...' - end - - def wait_for_completion log_file - duration = 0 - while true - raise 'browser takes too long' if duration > MAX_BROWSER_DURATION - print '.' - break if File.exist? log_file - sleep 5 - duration += 5 - end - puts - end - - def print_result result - puts "Finished in #{result['totalTime']} seconds." - puts - puts "#{result['numTestPasses']} tests passed, #{result['numTestFailures']} tests failed" - puts "(Results stored in '#{result['resultDir']}')" if result['resultDir'] - end - - end -end - -class SeleniumOnRails::AcceptanceTestRunner::SubProcess - def stop what - begin - puts "Stopping #{what} (pid=#{@pid}) ..." - Process.kill 9, @pid - rescue Errno::EPERM #such as the process is already closed (tabbed browser) - end - end -end - -class SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess - def initialize command - require 'win32/open3' #win32-open3 http://raa.ruby-lang.org/project/win32-open3/ - - puts command - input, output, error, @pid = Open4.popen4 command, 't', true - end -end - -class SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess - def initialize command - puts command - @pid = fork do - # Since we can't use shell redirects without screwing - # up the pid, we'll reopen stdin and stdout instead - # to get the same effect. - [STDOUT,STDERR].each {|f| f.reopen '/dev/null', 'w' } - exec command - end - end -end - -# The path to Safari should look like this: /Applications/Safari.app/Contents/MacOS/Safari -class SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess < SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess - def initialize command - f = File.open(Tempfile.new('selenium-on-rails').path, 'w') - f.puts <<-HTML - - - - - - - HTML - f.close - - super "#{command.split.first} #{f.path}" - end - -end - +$: << File.expand_path(File.dirname(__FILE__) + "/") +$: << File.expand_path(File.dirname(__FILE__) + "/../") +require 'paths' +require 'net/http' +require 'tempfile' + + +def c(var, default = nil) SeleniumOnRailsConfig.new.get var, default end +def c_b(var, default = nil) SeleniumOnRailsConfig.new.get(var, default) { yield } end + +BROWSERS = c :browsers, {} +REUSE_EXISTING_SERVER = c :reuse_existing_server, true +START_SERVER = c :start_server, false #TODO can't get it to work reliably on Windows, perhaps it's just on my computer, but I leave it off by default for now +HOST = c :host, 'localhost' +PORTS = c(:port_start, 3000)..c(:port_end, 3005) +BASE_URL_PATH = c :base_url_path, '/' +TEST_RUNNER_URL = c :test_runner_url, '/selenium/TestRunner.html' +MAX_BROWSER_DURATION = c :max_browser_duration, 2*60 +MULTI_WINDOW = c :multi_window, false +SERVER_COMMAND = c_b :server_command do + server_path = File.expand_path(File.dirname(__FILE__) + '/../../../../../script/server') + if RUBY_PLATFORM =~ /mswin/ + "ruby #{server_path} webrick -p %d -e test > NUL 2>&1" + else + # don't use redirects to /dev/nul since it makes the fork return wrong pid + # see UnixSubProcess + "#{server_path} webrick -p %d -e test" + end +end + +module SeleniumOnRails + class AcceptanceTestRunner + include SeleniumOnRails::Paths + + def run + raise 'no browser specified, edit/create config.yml' if BROWSERS.empty? + start_server + has_error = false + begin + BROWSERS.each_pair do |browser, path| + log_file = start_browser browser, path + wait_for_completion log_file + stop_browser + result = YAML::load_file log_file + print_result result + has_error ||= result['numTestFailures'].to_i > 0 + # File.delete log_file unless has_error + end + rescue + stop_server + raise + end + stop_server + raise 'Test failures' if has_error + end + + private + def start_server + PORTS.each do |p| + @port = p + case server_check + when :success + return if REUSE_EXISTING_SERVER + next + when Fixnum + next + when :no_response + next unless START_SERVER + do_start_server + return + end + end + raise START_SERVER ? 'failed to start server': 'failed to find existing server, run script/server -e test' + end + + def do_start_server + puts 'Starting server' + @server = start_subprocess(format(SERVER_COMMAND, @port)) + while true + print '.' + r = server_check + if r == :success + puts + return + end + raise "server returned error: #{r}" if r.instance_of? Fixnum + sleep 3 + end + end + + def server_check + begin + res = Net::HTTP.get_response HOST, TEST_RUNNER_URL, @port + return :success if (200..399).include? res.code.to_i + return res.code.to_i + rescue Errno::ECONNREFUSED + return :no_response + end + end + + def stop_server + return unless defined? @server + puts + @server.stop 'server' + end + + def start_browser browser, path + puts + puts "Starting #{browser}" + base_url = "http://#{HOST}:#{@port}#{BASE_URL_PATH}" + log = log_file browser + command = "\"#{path}\" \"http://#{HOST}:#{@port}#{TEST_RUNNER_URL}?test=tests&auto=true&baseUrl=#{base_url}&resultsUrl=postResults/#{log}&multiWindow=#{MULTI_WINDOW}\"" + @browser = start_subprocess command + log_path log + end + + def stop_browser + @browser.stop 'browser' + end + + def start_subprocess command + if RUBY_PLATFORM =~ /mswin/ + SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess.new command + elsif RUBY_PLATFORM =~ /darwin/i && command =~ /safari/i + SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess.new command + else + SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess.new command + end + end + + def log_file browser + FileUtils.mkdir_p(log_path('')) + (0..100).each do |i| + name = browser + (i==0 ? '' : "(#{i})") + '.yml' + return name unless File.exist?(log_path(name)) + end + raise 'there are way too many files in the log directory...' + end + + def wait_for_completion log_file + duration = 0 + while true + raise 'browser takes too long' if duration > MAX_BROWSER_DURATION + print '.' + break if File.exist? log_file + sleep 5 + duration += 5 + end + puts + end + + def print_result result + puts "Finished in #{result['totalTime']} seconds." + puts + puts "#{result['numTestPasses']} tests passed, #{result['numTestFailures']} tests failed" + puts "(Results stored in '#{result['resultDir']}')" if result['resultDir'] + end + + end +end + +class SeleniumOnRails::AcceptanceTestRunner::SubProcess + def stop what + begin + puts "Stopping #{what} (pid=#{@pid}) ..." + Process.kill 9, @pid + rescue Errno::EPERM #such as the process is already closed (tabbed browser) + end + end +end + +class SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess + def initialize command + require 'win32/open3' #win32-open3 http://raa.ruby-lang.org/project/win32-open3/ + + puts command + input, output, error, @pid = Open4.popen4 command, 't', true + end +end + +class SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess + def initialize command + puts command + @pid = fork do + # Since we can't use shell redirects without screwing + # up the pid, we'll reopen stdin and stdout instead + # to get the same effect. + [STDOUT,STDERR].each {|f| f.reopen '/dev/null', 'w' } + exec command + end + end +end + +# The path to Safari should look like this: /Applications/Safari.app/Contents/MacOS/Safari +class SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess < SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess + def initialize command + f = File.open(Tempfile.new('selenium-on-rails').path, 'w') + f.puts <<-HTML + + + + + + + HTML + f.close + + super "#{command.split.first} #{f.path}" + end + +end + diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb index c4d513cc..32f39f81 100644 --- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb +++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb @@ -1,54 +1,57 @@ -require 'active_record/fixtures' - -module SeleniumOnRails::FixtureLoader - include SeleniumOnRails::Paths - - def available_fixtures - fixtures = {} - path = fixtures_path + '/' - files = Dir["#{path}**/*.{yml,csv}"] - files.each do |file| - rel_path = file.sub(path, '') - next if skip_file? rel_path - fixture_set = File.dirname(rel_path) - fixture_set = '' if fixture_set == '.' - fixture = rel_path.sub /\.[^.]*$/, '' - fixtures[fixture_set] ||= [] - fixtures[fixture_set] << fixture - end - - fixtures - end - - def load_fixtures fixtures_param - available = nil - fixtures = fixtures_param.split(/\s*,\s*/).collect do |f| - fixture_set = File.dirname f - fixture_set = '' if fixture_set == '.' - fixture = File.basename f - if fixture == 'all' - available ||= available_fixtures - available[fixture_set] - else - f - end - end - fixtures.flatten! - fixtures.reject! {|f| f.blank? } - - if fixtures.any? - Fixtures.create_fixtures fixtures_path, fixtures - end - fixtures - end - - def clear_tables tables - table_names = tables.split /\s*,\s*/ - connection = ActiveRecord::Base.connection - table_names.each do |table| - connection.execute "DELETE FROM #{table}" - end - table_names - end - -end +require 'test/unit' +require 'active_record' +require 'active_record/fixtures' + +module SeleniumOnRails::FixtureLoader + include SeleniumOnRails::Paths + + def available_fixtures + fixtures = {} + path = fixtures_path + '/' + files = Dir["#{path}**/*.{yml,csv}"] + files.each do |file| + rel_path = file.sub(path, '') + next if skip_file? rel_path + fixture_set = File.dirname(rel_path) + fixture_set = '' if fixture_set == '.' + fixture = rel_path.sub /\.[^.]*$/, '' + fixtures[fixture_set] ||= [] + fixtures[fixture_set] << fixture + end + + fixtures + end + + def load_fixtures fixtures_param + available = nil + fixtures = fixtures_param.split(/\s*,\s*/).collect do |f| + fixture_set = File.dirname f + fixture_set = '' if fixture_set == '.' + fixture = File.basename f + if fixture == 'all' + available ||= available_fixtures + available[fixture_set] + else + f + end + end + fixtures.flatten! + fixtures.reject! {|f| f.blank? } + + if fixtures.any? + Fixtures.reset_cache # in case they've already been loaded and things have changed + Fixtures.create_fixtures fixtures_path, fixtures + end + fixtures + end + + def clear_tables tables + table_names = tables.split /\s*,\s*/ + connection = ActiveRecord::Base.connection + table_names.each do |table| + connection.execute "DELETE FROM #{table}" + end + table_names + end + +end diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb index 4374c4e9..cf6c86d3 100644 --- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb +++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb @@ -1,38 +1,36 @@ -# Provides partials support to test cases so they can include other partial test -# cases. -# -# The partial's commands are returned as html table rows. -module SeleniumOnRails::PartialsSupport - include SeleniumOnRails::Paths - - # Overrides where the partial is searched for, and returns only the command table rows. - def render_partial partial_path = default_template_name, object = nil, local_assigns = nil, status = nil - pattern = partial_pattern partial_path - filename = Dir[pattern].first - raise "Partial '#{partial_path}' cannot be found! (Looking for file: '#{pattern}')" unless filename - partial = render :file => filename, :use_full_path => false, :locals => local_assigns - extract_commands_from_partial partial - end - - # Extracts the commands from a partial. The partial must contain a html table - # and the first row is ignored since it cannot contain a command. - def extract_commands_from_partial partial - partial = partial.match(/.*| <%= key %> | <%= value %> |
| <%= key %> | <%= value %> |
- <% if defined?(@session_wiped) -%>
-
-<% end -%>
-
-The session is wiped clean.
- <% end-%> - <% if @cleared_tables.any? -%> -The following database tables are cleared:
--
- <% for table in @cleared_tables -%>
-
- <%= table %> - <% end-%> -
The following fixtures are loaded:
--
- <% for fixture in @loaded_fixtures -%>
-
- <%= fixture %> - <% end-%> -
-
+<% @page_title = 'Setup' -%>
+<% if defined?(@session_wiped) or @cleared_tables.any? or @loaded_fixtures.any? -%>
+ This page can be used to setup your Selenium tests. The following options can be used:
--
-
- keep_session -
-
- Per default the session is reset, so add keep_session in order to keep the current session.
-
-
-open <%= url_for %>?keep_session
- - fixtures -
-
- Loads one or many fixtures into the database. This will destroy the current data you have in your database! Use all as name in order to load all fixtures, or specify which fixtures that should be loaded (delimited by commas).
- If a test needs different data than you have in your fixtures, you can add another fixture set. A fixture set is just a sub directory in /test/fixtures/ where you can add alternate fixtures (e.g. /test/fixtures/blank/users.yml). --
- Available fixturesopen <%= url_for :fixtures => 'all' %> open <%= url_for :fixtures => 'fixture' %> open <%= url_for :fixtures => 'fixture_one' %>,fixture_two
- <% fixtures = available_fixtures -%> - <% for fixture_set in fixtures.keys.sort -%> - In the <%= fixture_set.blank? ? 'default' : "#{fixture_set}" %> fixture set: --
- <% fixtures[fixture_set].unshift fixture_set.blank? ? 'all' : "#{fixture_set}/all" -%>
- <% for fixture in fixtures[fixture_set] -%>
-
- <%= fixture %> - <% end -%> -
- - clear_tables -
-
- Clears one or many database tables. Another way to do the same thing is to create an empty fixture in a new fixture set (see fixtures above).
-
-
-open <%= url_for :clear_tables => 'sessions' %> open <%= url_for :clear_tables => 'sessions' %>,outgoing_messages
-
+ <% if defined?(@session_wiped) -%>
+
+<% end -%>
+
+The session is wiped clean.
+ <% end-%> + <% if @cleared_tables.any? -%> +The following database tables are cleared:
+-
+ <% for table in @cleared_tables -%>
+
- <%= table %> + <% end-%> +
The following fixtures are loaded:
+-
+ <% for fixture in @loaded_fixtures -%>
+
- <%= fixture %> + <% end-%> +
+
diff --git a/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml b/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml
index 5973fc97..2494a4ea 100644
--- a/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml
+++ b/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml
@@ -1,26 +1,26 @@
-<% @page_title = test_suite_name @suite_path -%>
+<% @page_title = test_suite_name @suite_path -%>
-
-
-This page can be used to setup your Selenium tests. The following options can be used:
+-
+
- keep_session +
-
+ Per default the session is reset, so add keep_session in order to keep the current session.
+
+
+open <%= url_for %>?keep_session
+ - fixtures +
-
+ Loads one or many fixtures into the database. This will destroy the current data you have in your database! Use all as name in order to load all fixtures, or specify which fixtures that should be loaded (delimited by commas).
+ If a test needs different data than you have in your fixtures, you can add another fixture set. A fixture set is just a sub directory in /test/fixtures/ where you can add alternate fixtures (e.g. /test/fixtures/blank/users.yml). ++
+ Available fixturesopen <%= url_for :fixtures => 'all' %> open <%= url_for :fixtures => 'fixture' %> open <%= url_for :fixtures => 'fixture_one' %>,fixture_two
+ <% fixtures = available_fixtures -%> + <% for fixture_set in fixtures.keys.sort -%> + In the <%= fixture_set.blank? ? 'default' : "#{fixture_set}" %> fixture set: +-
+ <% fixtures[fixture_set].unshift fixture_set.blank? ? 'all' : "#{fixture_set}/all" -%>
+ <% for fixture in fixtures[fixture_set] -%>
+
- <%= fixture %> + <% end -%> +
+ - clear_tables +
-
+ Clears one or many database tables. Another way to do the same thing is to create an empty fixture in a new fixture set (see fixtures above).
+
+
+open <%= url_for :clear_tables => 'sessions' %> open <%= url_for :clear_tables => 'sessions' %>,outgoing_messages
+
| <%= @page_title %> | ||
|---|---|---|
| <%= link_to_test_case name, path %> | ||
| <%= @page_title %> |
|---|
| <%= link_to_test_case name, path %> |
selenium-rc initial page
- - + + + + + +selenium-rc initial page
+ + diff --git a/vendor/selenium/InjectedRemoteRunner.html b/vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html similarity index 95% rename from vendor/selenium/InjectedRemoteRunner.html rename to vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html index cb4432c0..8bd0fb64 100644 --- a/vendor/selenium/InjectedRemoteRunner.html +++ b/vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html @@ -1,8 +1,8 @@ - - - - - -selenium-rc initial page
- - + + + + + +selenium-rc initial page
+ + diff --git a/vendor/selenium/RemoteRunner.html b/vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html similarity index 100% rename from vendor/selenium/RemoteRunner.html rename to vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html diff --git a/vendor/selenium/SeleniumLog.html b/vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html similarity index 100% rename from vendor/selenium/SeleniumLog.html rename to vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html diff --git a/vendor/selenium/TestPrompt.html b/vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html similarity index 97% rename from vendor/selenium/TestPrompt.html rename to vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html index 58ba1cb0..d9d53b91 100644 --- a/vendor/selenium/TestPrompt.html +++ b/vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html @@ -1,123 +1,123 @@ - - - - - -| ↑ | -↑ | -↑ | -
|---|---|---|
| Test Suite | -Current Test | -Control Panel | -
| - |
-
-
-
-Selenium-by ThoughtWorks and friends- --For more information on Selenium, visit - - - http://selenium.openqa.org -- - |
-|
| ↑ | +↑ | +↑ | +
|---|---|---|
| Test Suite | +Current Test | +Control Panel | +
| + |
+
+
+
+Selenium+by ThoughtWorks and friends+ ++For more information on Selenium, visit + + + http://selenium.openqa.org ++ + |
+|
Comment 2
+Comment 2
| Only comments |
|---|
Comment 1
-Comment 2
+Comment 2
END input = <Comment 2
+ +Comment 2
| Comments and commands | ||
|---|---|---|
| goBack | ||
Comment 2
+Comment 2
| Comments, commands and comments | ||
|---|---|---|
| goBack | ||
Comment 3
END + input = <| Foo |
| Bar |
| Foo |
| Bar |
| Foo |
| Bar |
| Foo |
| Bar |
| Empty suite |
|---|
| All test cases |
|---|
| Html |
| Own layout |
| Rhtml |
| Rselenese |
| Selenese |
| Partials.All partials |
| Suite one.Suite one testcase1 |
| Suite one.Suite one testcase2 |
| Suite one.Subsuite.Suite one subsuite testcase |
| Suite two.Suite two testcase |
| Suite one |
|---|
| Suite one testcase1 |
| Suite one testcase2 |
| Subsuite.Suite one subsuite testcase |
| Subsuite |
|---|
| Suite one subsuite testcase |
Testing plain HTML
-| Test HTML | ||
|---|---|---|
| open | /selenium/setup | |
Testing plain HTML
+| Test HTML | ||
|---|---|---|
| open | /selenium/setup | |
and it works...
\ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/test_data/own_layout.html b/vendor/plugins/selenium-on-rails/test_data/own_layout.html index a45c5498..5f07842e 100644 --- a/vendor/plugins/selenium-on-rails/test_data/own_layout.html +++ b/vendor/plugins/selenium-on-rails/test_data/own_layout.html @@ -1,12 +1,12 @@ - - -| Test own layout | ||
|---|---|---|
| open | /selenium/setup | |
| Test own layout | ||
|---|---|---|
| open | /selenium/setup | |
This should never be visible!
-| HTML partial | ||
|---|---|---|
| type | partial | HTML partial |
This should never be visible!
+| HTML partial | ||
|---|---|---|
| type | partial | HTML partial |
Neither should this!
\ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel b/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel index 28e7bf91..65150cb6 100644 --- a/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel +++ b/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel @@ -1,2 +1,2 @@ -type 'nesting', 'Nesting partial' +type 'nesting', 'Nesting partial' include_partial 'partials/rsel', :hello => hello.reverse \ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml b/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml index af6599de..b7045860 100644 --- a/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml +++ b/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml @@ -1,6 +1,6 @@ -This should never be visible!
-| RHTML partial | ||
|---|---|---|
| type | <%= hello %> | RHTML partial |
This should never be visible!
+| RHTML partial | ||
|---|---|---|
| type | <%= hello %> | RHTML partial |
Neither should this!
\ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel b/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel index 0ce0e9fe..456323e9 100644 --- a/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel +++ b/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel @@ -1 +1 @@ -type hello, 'RSelenese partial' +type hello, 'RSelenese partial' diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel b/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel index 353f0f26..f0339fa5 100644 --- a/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel +++ b/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel @@ -1,5 +1,5 @@ -h1. This should not be visible! - -|type|partial|Selenese partial| - +h1. This should not be visible! + +|type|partial|Selenese partial| + p. Neither should this! \ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel b/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel index 08c0faf5..b4b7aa41 100644 --- a/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel +++ b/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel @@ -1,5 +1,5 @@ -include_partial 'partial', :source => title -['html', 'rhtml', 'sel', 'rsel'].each do |format| - include_partial "partials/#{format}", :hello => 'world' -end +include_partial 'partial', :source => title +['html', 'rhtml', 'sel', 'rsel'].each do |format| + include_partial "partials/#{format}", :hello => 'world' +end include_partial 'partials/nesting', :hello => 'world' \ No newline at end of file diff --git a/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml b/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml index 2ae4e413..e8e72ebb 100644 --- a/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml +++ b/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml @@ -1,7 +1,7 @@ -| <%= @page_title %> | ||
|---|---|---|
| open | <%= page %> | |
| <%= @page_title %> | ||
|---|---|---|
| open | <%= page %> | |