kbaum-webrat 0.5.1 → 0.6.1.pre

data/spec/integration/rails/test/integration/button_click_test.rb

@@ -1,80 +1,66 @@
 require 'test_helper'
 
 class ButtonClickTest < ActionController::IntegrationTest
-  # <button type="button" ...>
-  test "should click button with type button by id" do
-    visit buttons_path
-    click_button "button_button_id"
-  end
-  test "should click button with type button by value" do
-    visit buttons_path
-    click_button "button_button_value"
-  end
-  test "should click button with type button by html" do
-    visit buttons_path
-    click_button "button_button_text"
-  end
-
   # <button type="submit" ...>
   test "should click button with type submit by id" do
     visit buttons_path
     click_button "button_submit_id"
+    assert_contain "success"
   end
   test "should click button with type submit by value" do
     visit buttons_path
     click_button "button_submit_value"
+    assert_contain "success"
   end
   test "should click button with type submit by html" do
     visit buttons_path
     click_button "button_submit_text"
+    assert_contain "success"
   end
 
   # <button type="image" ...>
   test "should click button with type image by id" do
     visit buttons_path
     click_button "button_image_id"
+    assert_contain "success"
   end
   test "should click button with type image by value" do
     visit buttons_path
     click_button "button_image_value"
+    assert_contain "success"
   end
   test "should click button with type image by html" do
     visit buttons_path
     click_button "button_image_text"
-  end
-
-  # <input type="button" ...>
-  test "should click image with type button by id" do
-    visit buttons_path
-    click_button "input_button_id"
-  end
-  test "should click input with type button by value" do
-    visit buttons_path
-    click_button "input_button_value"
+    assert_contain "success"
   end
 
   # <input type="submit" ...>
   test "should click input with type submit by id" do
     visit buttons_path
     click_button "input_submit_id"
+    assert_contain "success"
   end
   test "should click input with type submit by value" do
     visit buttons_path
     click_button "input_submit_value"
+    assert_contain "success"
   end
 
   # <input type="image" ...>
   test "should click input with type image by id" do
     visit buttons_path
     click_button "input_image_id"
+    assert_contain "success"
   end
   test "should click input with type image by value" do
     visit buttons_path
     click_button "input_image_value"
+    assert_contain "success"
   end
   test "should click input with type image by alt" do
     visit buttons_path
     click_button "input_image_alt"
+    assert_contain "success"
   end
-
-end
+end

data/spec/integration/rails/test/integration/fill_in_test.rb

@@ -21,4 +21,4 @@ class FillInTest < ActionController::IntegrationTest
     visit fields_path
     fill_in "[Field]:", :with => "value"
   end
-end
+end

data/spec/integration/rails/test/integration/link_click_test.rb

@@ -24,4 +24,4 @@ class LinkClickTest < ActionController::IntegrationTest
     click_link "Link With (parens)"
     assert_contain("Link:link_with_parens")
   end
-end
+end

data/spec/integration/rails/test/integration/webrat_test.rb

@@ -22,11 +22,14 @@ class WebratTest < ActionController::IntegrationTest
     check "TOS"
     select "January"
     click_button "Test"
+    assert_contain "OK"
   end
 
   test "should check the value of a field" do
-    visit "/"
-    assert field_labeled("Prefilled").value, "text"
+    webrat.simulate do
+      visit "/"
+      assert field_labeled("Prefilled").value, "text"
+    end
   end
 
   test "should not carry params through redirects" do
@@ -43,20 +46,26 @@ class WebratTest < ActionController::IntegrationTest
 
   test "should follow internal redirects" do
     visit internal_redirect_path
-    assert !response.redirect?
+    webrat.simulate do
+      assert !response.redirect?
+    end
     assert response.body.include?("OK")
   end
 
   test "should not follow external redirects" do
-    visit external_redirect_path
-    assert response.redirect?
+    webrat.simulate do
+      visit external_redirect_path
+      assert response.redirect?
+    end
   end
 
   test "should recognize the host header to follow redirects properly" do
-    header "Host", "foo.bar"
-    visit host_redirect_path
-    assert !response.redirect?
-    assert response.body.include?("OK")
+    webrat.simulate do
+      header "Host", "foo.bar"
+      visit host_redirect_path
+      assert !response.redirect?
+      assert response.body.include?("OK")
+    end
   end
 
   test "should click link by text" do
@@ -81,6 +90,23 @@ class WebratTest < ActionController::IntegrationTest
     assert_have_selector "h1"
   end
 
+  test "should accept an Object argument to #within and translate using dom_id" do
+    webrat.simulate do
+      visit within_path
+
+      object = Object.new
+      def object.id
+        nil
+      end
+
+      within(object) do
+        click_link "Edit Object"
+      end
+
+      assert_contain "Webrat Form"
+    end
+  end
+
   # Firefox detects and prevents infinite redirects under Selenium
   unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'
      test "should detect infinite redirects" do

data/spec/integration/rails/test/test_helper.rb

@@ -12,6 +12,7 @@ require "webrat"
 
 Webrat.configure do |config|
   config.mode = ENV['WEBRAT_INTEGRATION_MODE'].to_sym
+  config.selenium_browser_key = '*safari'
 end
 
 ActionController::Base.class_eval do

data/spec/private/core/field_spec.rb

@@ -2,18 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 module Webrat
   describe Field do
-    unless RUBY_PLATFORM =~ /java/
-      it "should have nice inspect output" do
-        html = <<-HTML
-          <html>
-          <input type='checkbox' checked='checked' />
-          </html>
-        HTML
+    it "should have nice inspect output" do
+      html = <<-HTML
+        <html>
+        <input type='checkbox' checked='checked' />
+        </html>
+      HTML
 
-        element = Webrat::XML.document(html).css("input").first
-        checkbox = CheckboxField.new(nil, element)
-        checkbox.inspect.should =~ /#<Webrat::CheckboxField @element=<input type=['"]checkbox['"] checked(=['"]checked['"])?\/?>>/
-      end
+      element = Webrat::XML.document(html).css("input").first
+      checkbox = CheckboxField.new(nil, element)
+      checkbox.inspect.should =~ /^#<Webrat::CheckboxField @element=/
     end
   end
 

data/spec/private/rails/rails_adapter_spec.rb

@@ -83,28 +83,4 @@ describe Webrat::RailsAdapter do
   it "should provide a doc_root" do
     Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
   end
-
-  it "should accept an ActiveRecord argument to #within and translate to a selector using dom_id" do
-    pending "Move this to spec/public/within_spec.rb"
-
-    body = <<-HTML
-      <a href="/page1">Edit</a>
-      <div id="new_object">
-        <a href="/page2">Edit</a>
-      </div>
-    HTML
-
-    response = mock("response", :body => body, :headers => {}, :code => 200)
-    @integration_session.stub!(:response => response)
-    @integration_session.should_receive(:get).with("/page2", {}, nil)
-
-    rails_session = Webrat::RailsAdapter.new(@integration_session)
-
-    object = Object.new
-    object.stub!(:id => nil)
-
-    rails_session.within(object) do
-      rails_session.click_link 'Edit'
-    end
-  end
 end

data/spec/public/basic_auth_spec.rb

@@ -6,7 +6,7 @@ describe "Basic Auth HTTP headers" do
   end
 
   it "should be present in visit" do
-    webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
+    webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ="})
     visit("/")
   end
 
@@ -18,7 +18,18 @@ describe "Basic Auth HTTP headers" do
       </form>
       </html>
     HTML
-    webrat_session.should_receive(:post).with("/form1", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
+    webrat_session.should_receive(:post).with("/form1", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ="})
     click_button
   end
+
+  context "with long username and password combination" do
+    before do
+      basic_auth('user', 'secret1234567890123456789012345678901234567890123456789012345678901234567890')
+    end
+
+    it "should be present, without new lines, in visit" do
+      webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkw"})
+      visit("/")
+    end
+  end
 end

data/spec/public/click_link_spec.rb

@@ -144,6 +144,27 @@ describe "click_link" do
     click_link "Posts"
   end
 
+  it "should click rails 2.3.4 javascript links with authenticity tokens" do
+    with_html <<-HTML
+      <html>
+      <a href="/posts" onclick="var f = document.createElement('form');
+        f.style.display = 'none';
+        this.parentNode.appendChild(f);
+        f.method = 'POST';
+        f.action = this.href;
+        var s = document.createElement('input');
+        s.setAttribute('type', 'hidden');
+        s.setAttribute('name', 'authenticity_token');
+        s.setAttribute('value', 'aa79cb354597a60a3786e7e291ed4f74d77d3a62=/$a');
+        f.appendChild(s);
+        f.submit();
+        return false;">Posts</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/posts", "authenticity_token" => "aa79cb354597a60a3786e7e291ed4f74d77d3a62=/$a")
+    click_link "Posts"
+  end
+
   it "should click rails javascript delete links" do
     with_html <<-HTML
       <html>

data/spec/public/fill_in_spec.rb

@@ -15,7 +15,7 @@ describe "fill_in" do
     fill_in "User Text", :with => "filling text area"
     click_button
   end
-  
+
   it "should support multiline values" do
     with_html <<-HTML
       <html>

data/spec/public/matchers/have_selector_spec.rb

@@ -61,7 +61,7 @@ describe "have_selector" do
         @body.should have_selector("li", :count => 4)
       }.should raise_error(Spec::Expectations::ExpectationNotMetError)
     end
-    
+
     it "should convert a string to an integer for count" do
       @body.should have_selector("li", :count => "3")
     end