<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -31,7 +31,6 @@ $SHOW_SURVEYS=false
 
 $IP_ADDRESS_OF_SERVER='127.0.0.1'
 
-config.gem &quot;selenium-client&quot;, :lib =&gt; false # :version =&gt; &quot;1.2.15&quot;
 config.gem 'faker', :version =&gt; &quot;0.3.1&quot;
 config.gem &quot;rspec-custom-matchers&quot;, :version =&gt; &quot;0.1.0&quot;, :lib =&gt; false
 config.gem &quot;remi-indifferent-variable-hash&quot;, :version =&gt; &quot;0.1.0&quot;, :lib =&gt; false</diff>
      <filename>config/environments/test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -22,13 +22,13 @@ begin
   task :noop do
   end
 
-  task :default =&gt; :spec
+  task :default =&gt; [:spec, &quot;test:acceptance:web&quot;]
   task :stats =&gt; &quot;spec:statsetup&quot;
 
   desc &quot;Run all specs in spec directory (excluding plugin specs)&quot;
   Spec::Rake::SpecTask.new(:spec =&gt; spec_prereq) do |t|
     t.spec_opts = ['--options', &quot;\&quot;#{RAILS_ROOT}/spec/spec.opts\&quot;&quot;]
-    t.spec_files = FileList['spec/**/*/*_spec.rb'].exclude('spec/selenium/*') #  Exclude Selenium specs from default run.
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
   end
 
   namespace :spec do</diff>
      <filename>lib/tasks/rspec.rake</filename>
    </modified>
    <modified>
      <diff>@@ -1,29 +1,47 @@
-begin
-  require 'selenium/rake/tasks'
-  Selenium::Rake::RemoteControlStartTask.new do |rc|
-    rc.port = 4444
-    rc.timeout_in_seconds = 3 * 60
-    rc.background = true
-    rc.wait_until_up_and_running = true
-    rc.additional_args &lt;&lt; &quot;-singleWindow&quot;
-  end
+# begin
+#   require 'selenium/rake/tasks'
+#   Selenium::Rake::RemoteControlStartTask.new do |rc|
+#     rc.port = 4444
+#     rc.timeout_in_seconds = 3 * 60
+#     rc.background = true
+#     rc.wait_until_up_and_running = true
+#     rc.additional_args &lt;&lt; &quot;-singleWindow&quot;
+#   end
+# 
+#   Selenium::Rake::RemoteControlStopTask.new do |rc|
+#     rc.host = &quot;localhost&quot;
+#     rc.port = 4444
+#     rc.timeout_in_seconds = 3 * 60
+#   end
+# rescue LoadError =&gt; e
+#   puts &quot;Couldn't load selenium-client&quot;
+# end
+# 
+# require 'spec/rake/spectask'
+# desc 'Run acceptance tests for web application'
+# Spec::Rake::SpecTask.new(:'test:acceptance:web') do |t|
+#   t.spec_opts &lt;&lt; '--color'
+#   t.spec_opts &lt;&lt; &quot;--require 'rubygems,selenium/rspec/reporting/selenium_test_report_formatter'&quot;
+#   t.spec_opts &lt;&lt; &quot;--format=Selenium::RSpec::SeleniumTestReportFormatter:./tmp/acceptance_tests_report.html&quot;
+#   t.spec_opts &lt;&lt; &quot;--format=progress&quot;                
+#   t.verbose = true
+#   t.spec_files = FileList['spec/selenium/*_spec.rb']
+# end
 
-  Selenium::Rake::RemoteControlStopTask.new do |rc|
-    rc.host = &quot;localhost&quot;
-    rc.port = 4444
-    rc.timeout_in_seconds = 3 * 60
+desc 'Run acceptance tests in the browser'
+namespace :test do
+  namespace :acceptance do
+    task :web do
+      if !ENV[&quot;SKIP_SELENIUM&quot;]
+        ENV[&quot;RAILS_ENV&quot;] = &quot;test&quot;
+        Rake::Task['truncate'].invoke
+        ENV[&quot;NAME&quot;] = &quot;bootstrap&quot;
+        Rake::Task['scenarios:load'].invoke
+        `script/server -e test -d`
+        `java -jar vendor/selenium-remote-control/selenium-server-standalone.jar -htmlSuite &quot;*firefox&quot; &quot;http://localhost:3000&quot; spec/selenium/development_suite.html tmp/development_results.html`
+        `java -jar vendor/selenium-remote-control/selenium-server-standalone.jar -htmlSuite &quot;*firefox&quot; &quot;http://localhost:3000&quot; spec/selenium/production_suite.html tmp/production_results.html`
+        `kill \`cat tmp/pids/mongrel.pid\``
+      end
+    end
   end
-rescue LoadError =&gt; e
-  puts &quot;Couldn't load selenium-client&quot;
-end
-
-require 'spec/rake/spectask'
-desc 'Run acceptance tests for web application'
-Spec::Rake::SpecTask.new(:'test:acceptance:web') do |t|
-  t.spec_opts &lt;&lt; '--color'
-  t.spec_opts &lt;&lt; &quot;--require 'rubygems,selenium/rspec/reporting/selenium_test_report_formatter'&quot;
-  t.spec_opts &lt;&lt; &quot;--format=Selenium::RSpec::SeleniumTestReportFormatter:./tmp/acceptance_tests_report.html&quot;
-  t.spec_opts &lt;&lt; &quot;--format=progress&quot;                
-  t.verbose = true
-  t.spec_files = FileList['spec/selenium/*_spec.rb']
 end</diff>
      <filename>lib/tasks/rspec_selenium.rake</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>script/selenium-ide-tests</filename>
    </removed>
    <removed>
      <filename>script/selenium-server</filename>
    </removed>
    <removed>
      <filename>spec/selenium/account_controller_acceptance.rb</filename>
    </removed>
    <removed>
      <filename>spec/selenium/selenium_spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>spec/selenium/template_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/.specification</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/README.markdown</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/examples/rspec/google_spec.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/examples/script/google.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/examples/testunit/google_test.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/nautilus/shell.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/base.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/driver.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/extensions.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/generated_driver.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/idiomatic.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/javascript_expression_builder.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/javascript_frameworks/jquery.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/javascript_frameworks/prototype.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/protocol.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/client/selenium_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/command_error.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/protocol_error.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rake/remote_control_start_task.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rake/remote_control_stop_task.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rake/tasks.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/remote_control/remote_control.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rspec/reporting/file_path_strategy.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rspec/reporting/html_report.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rspec/reporting/selenium_test_report_formatter.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rspec/reporting/system_capture.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rspec/rspec_extensions.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/selenium/rspec/spec_helper.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/lib/tcp_socket_extension.rb</filename>
    </removed>
    <removed>
      <filename>vendor/gems/selenium-client-1.2.15/test/all_unit_tests.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>e313144af70049f07d9a4e2f314798c1d30314f6</id>
    </parent>
  </parents>
  <author>
    <name>mchung</name>
    <email>mchung@78829999-583a-0410-bd01-8a9b849fd409</email>
  </author>
  <url>http://github.com/eol/eol/commit/22fa6f97c8799283a2d35d0828295681ef2f29b9</url>
  <id>22fa6f97c8799283a2d35d0828295681ef2f29b9</id>
  <committed-date>2009-07-17T14:02:25-07:00</committed-date>
  <authored-date>2009-07-17T14:02:25-07:00</authored-date>
  <message>EOLINFRASTRUCTURE-1172: Modified Rake task to launch Selenium IDE browser based tests

git-svn-id: file:///data/subversion/eol/trunk@875 78829999-583a-0410-bd01-8a9b849fd409</message>
  <tree>c58fda15c9d10686c7760fe222034ce6d9fd7cbf</tree>
  <committer>
    <name>mchung</name>
    <email>mchung@78829999-583a-0410-bd01-8a9b849fd409</email>
  </committer>
</commit>
