[etch-devel] SF.net SVN: etch:[326] trunk/test

[<jh...@us...>]

Revision: 326
          http://etch.svn.sourceforge.net/etch/?rev=326&view=rev
Author:   jheiss
Date:     2012-04-27 01:44:06 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Update some instances of old search syntax to ransack syntax.  Plus a
few other minor updates in etchtest.rb

Modified Paths:
--------------
    trunk/test/etchtest.rb
    trunk/test/test_auth.rb
    trunk/test/test_conf.rb

Modified: trunk/test/etchtest.rb
===================================================================
--- trunk/test/etchtest.rb	2012-04-27 01:42:43 UTC (rev 325)
+++ trunk/test/etchtest.rb	2012-04-27 01:44:06 UTC (rev 326)
@@ -121,7 +121,7 @@
                 throw :serverstarted
               end
             end
-          rescue => e
+          rescue
           end
           sleep(1)
         end
@@ -133,7 +133,7 @@
       if UNICORN
         exec("cd #{SERVERDIR} && #{RUBY} `which unicorn_rails` -p #{port}")
       else
-        exec("cd #{SERVERDIR} && #{RUBY} ./script/server -p #{port}")
+        exec("cd #{SERVERDIR} && #{RUBY} `which rails` server -p #{port}")
       end
     end
     {:port => port, :pid => pid, :repo => serverbase}
@@ -209,7 +209,7 @@
     hostname = Facter['fqdn'].value
     lrm = ''
     Net::HTTP.start('localhost', @server[:port]) do |http|
-      response = http.get("/results.xml?clients.name=#{hostname}&sort=created_at_reverse")
+      response = http.get("/results.xml?q[client_name_eq]=#{hostname}&q[s]=created_at+desc")
       if !response.kind_of?(Net::HTTPSuccess)
         response.error!
       end

Modified: trunk/test/test_auth.rb
===================================================================
--- trunk/test/test_auth.rb	2012-04-27 01:42:43 UTC (rev 325)
+++ trunk/test/test_auth.rb	2012-04-27 01:44:06 UTC (rev 326)
@@ -39,7 +39,7 @@
     hostname = Facter['fqdn'].value
     Net::HTTP.start('localhost', @server[:port]) do |http|
       # Find our client id
-      response = http.get("/clients.xml?name=#{hostname}")
+      response = http.get("/clients.xml?q[name_eq]=#{hostname}")
       if !response.kind_of?(Net::HTTPSuccess)
         response.error!
       end

Modified: trunk/test/test_conf.rb
===================================================================
--- trunk/test/test_conf.rb	2012-04-27 01:42:43 UTC (rev 325)
+++ trunk/test/test_conf.rb	2012-04-27 01:44:06 UTC (rev 326)
@@ -159,7 +159,7 @@
     # these changes.
     Net::HTTP.start('localhost', @server[:port]) do |http|
       # Find our client id
-      response = http.get("/clients.xml?name=#{hostname}")
+      response = http.get("/clients.xml?q[name_eq]=#{hostname}")
       if !response.kind_of?(Net::HTTPSuccess)
         response.error!
       end
@@ -169,8 +169,8 @@
         client_id = response_xml.elements['/clients/client/id'].text
         # If there's an existing "sshrsakey" fact for this client then
         # delete it
-        response = http.get("/facts.xml?search[client_id]=#{client_id}&" +
-          "search[key]=sshrsakey")
+        response = http.get("/facts.xml?q[client_id_eq]=#{client_id}&" +
+          "q[key_eq]=sshrsakey")
         if !response.kind_of?(Net::HTTPSuccess)
           response.error!
         end

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.