Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: thoughtbot/capybara-webkit
...
head fork: JonathanTron/capybara-webkit
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 18, 2011
@eparreno eparreno add sinatra and tilt to runtime dependencies 454ebc2
@eparreno eparreno preserve permissions when copying webkit_server file 3d10ff2
@eparreno eparreno fix sinatra version to 1.1.2 4575f6f
@eparreno eparreno sinatra as development dependency f7ad39f
Commits on Mar 21, 2011
@chrisconley chrisconley added tilt to gemfile 1ba3deb
@nicholaides nicholaides Merge branch 'master' of github.com:nicholaides/capybara-webkit 5936148
@nicholaides nicholaides Removing Title from gemfile. fc0ce5b
@chrisconley chrisconley bundled 840da62
Commits on Mar 22, 2011
@nicholaides nicholaides Adding a "render" method to the browser object
In steak, for example, you can do:
  page.driver.browser.render("some/file/path/screenshot.png")
eabc7b2
@nicholaides nicholaides Merge branch 'master' of github.com:nicholaides/capybara-webkit 2883656
Commits on Apr 13, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'nicholaides/master' d3b2f78
@JonathanTron JonathanTron Add naive implementation to pass capybara "driver with header support"
What is implemented:

- Store all headers from all response send by the QNetworkAccessManager after
  an page load has been triggered. This implies that requests headers related to
  loading JS/CSS/XHR will be stored too. We only look at the first header list
  in the ruby part.
- Reset/Visit commands clear the last response headers

What needs to be done:

- Better generation of JSON (QJson ?)
- Clicking on link which change the page should reset the last response headers.
- Store the whole response ? Keep only the good one.
- Implement other missing feature of Capybara
cbef8dc
@JonathanTron JonathanTron Correct duplicate entry in find_command.h 72b1e91
Commits on Apr 14, 2011
@JonathanTron JonathanTron Ignore Info.plist 10a9b2b
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	capybara-webkit.gemspec
39adb77
@JonathanTron JonathanTron Add naive StatusCode command 722f855
@JonathanTron JonathanTron Add spec for response_headers and status_code for the driver 692ca22
@JonathanTron JonathanTron Change rvmrc to use ruby 1.9.2p180... because I don't care anymore ab…
…out Ruby 1.8.x
6ca2a6d
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	.rvmrc
645fc23
Commits on Apr 15, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master' 20845b3
Commits on Apr 25, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	capybara-webkit.gemspec
	src/Connection.cpp
	src/Visit.cpp
	src/WebPage.cpp
	src/WebPage.h
	src/find_command.h
	src/webkit_server.pro
1bba988
Commits on May 09, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	src/Reset.cpp
	src/webkit_server.pro
2699cc0
@JonathanTron JonathanTron Update to emit the new Response object b748573
Commits on May 20, 2011
@JonathanTron JonathanTron Force encoding to UTF-8 for response on ruby 1.9.x, as we receive UTF…
…-8 QString only from server.

This fix the failing spec related to UTF-8 encoding checks. It's not the best solution,
but TCPSocket on Ruby 1.9.x defaults to ASCII-8bit, the server sends responses as
UTF-8 encoded string only.
a759712
Commits on May 25, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	.gitignore
	spec/driver_spec.rb
961c36a
Commits on Jun 15, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	lib/capybara/driver/webkit/browser.rb
	src/Visit.cpp
83b0e5c
Commits on Aug 10, 2011
@JonathanTron JonathanTron Merge remote-tracking branch 'thoughtbot/master'
Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	spec/driver_spec.rb
	spec/integration/driver_spec.rb
	src/Connection.cpp
	src/Render.cpp
	src/Render.h
	src/Reset.cpp
	src/WebPage.cpp
	src/WebPage.h
	src/find_command.h
	src/webkit_server.pro
ff603e8
@JosephHalter JosephHalter Try to fix gem compilation of native extensions with foreign locale f112a98
Commits on Aug 11, 2011
@JonathanTron JonathanTron Do not log QNetworkReply::OperationCanceledError as an error.
When sending no content (like 204 No Response) webkit set this error in reply.
325fdd6
@JonathanTron JonathanTron Ignore QNetworkReply::RemoteHostClosedError too 06dfdd3
Something went wrong with that request. Please try again.