pyrite 0.5.5 → 0.5.6

data/lib/pyrite.rb

@@ -6,6 +6,13 @@ DatabaseCleaner.strategy = :truncation
 require 'pyrite/pyrite_test'
 
 module Pyrite
+  # set the default JS framework for the AUT
+  # e.g `Pyrite.js_framework = :jquery`
+  # can be set in pyrite_helper.rb
+  # Makes `wait_for :ajax` use the correct JS lib.
+  # Defaults to jQuery.
+  mattr_accessor :js_framework
+  @@js_framework = :jquery
 
   # The ip address the RC is running on
   mattr_accessor :rc_host

data/lib/pyrite/dsl.rb

@@ -36,7 +36,7 @@ module Pyrite
       browser.click("link=#{text}")
     end
 
-    # Press a button based on its text
+    # Press an submit (not button) input based on its text
     def press(text)
       browser.click("css=input[type=submit][value='#{text}']")
     end
@@ -56,12 +56,16 @@ module Pyrite
       browser.select("css=#{element}", option)
     end
 
-    # Wait for a specific element or the page to load
+    # Wait for a specific element, the page to load
+    # or an AJAX request to return
     def wait_for(element)
-      if element == :page_load
-        browser.wait_for_page_to_load :page
-      else
-        browser.wait_for :element => "#{element}"
+      case element
+        when :page_load
+          browser.wait_for_page_to_load :page
+        when :ajax
+          browser.wait_for(:wait_for => :ajax, :javascript_framework => Pyrite.js_framework)
+        else
+          browser.wait_for :element => "css=#{element}"
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Adam Rogers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +01:00
+date: 2010-05-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency