Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/assaf/zombie

  • Loading branch information...
commit 1c0ff12513b76f8340683896b1d6dbb7b23fdcb6 2 parents 1a406a4 + e7877dc
@boblail boblail authored
View
4 .npmignore
@@ -1,4 +0,0 @@
-.git*
-.npm
-html
-node_modules
View
6 CHANGELOG.md
@@ -2,7 +2,7 @@ zombie.js-changelog(7) -- Changelog
===================================
-### Version 0.8.9 2011-01-05
+### Version 0.8.9 2011-01-10
Properly use the existance operator so empty strings are sent (José Valim).
@@ -18,10 +18,10 @@ You can now call browser methods that accept a selector (e.g. `fill`,
Fix to populate fields even if field type is invalid (Bob Lail).
-Update to HTML5 0.2.9.
+Update to HTML5 0.2.12.
238 Tests
- 3.3 sec to complete
+ 3.2 sec to complete
### Version 0.8.8 2011-01-04
View
3  Cakefile
@@ -49,7 +49,7 @@ task "watch", "Continously compile CoffeeScript to JavaScript", ->
cmd = spawn("coffee", ["-cw", "-o", "lib", "src"])
cmd.stdout.on "data", (data)-> process.stdout.write green + data + reset
cmd.on "error", onerror
-
+
clean = (callback)->
exec "rm -rf html lib man7", callback
@@ -205,4 +205,3 @@ task "publish", "Publish new version (Git, NPM, site)", ->
# We can do this in parallel.
publishDocs onerror
-
View
14 README.md
@@ -71,7 +71,7 @@ using Zombie.js with Vows.
Whenever you want to wait for all events to be processed, just call
`browser.wait` with a callback.
-Read more [on the Browser API](api.html)
+Read more [on the Browser API](api)
## Hunting
@@ -122,8 +122,8 @@ selectors you get additional and quite useful extensions, such as
so forth. Check out the [Sizzle.js
documentation](https://github.com/jeresig/sizzle/wiki) for more details.
-Read more [on the Browser API](api.html) and [CSS
-selectors](selectors.html)
+Read more [on the Browser API](api) and [CSS
+selectors](selectors)
@@ -182,7 +182,7 @@ Let's combine all of that into one example:
assert.equal(browser.location, "http://localhost:3003/thankyou");
});
-Read more [on the Browser API](api.html)
+Read more [on the Browser API](api)
## Readiness
@@ -221,7 +221,7 @@ browser state:
trying to access. Even better, provide a test script I can run from the
Node.js console (similar to step 1 above).
-Read more [about troubleshooting](troubleshoot.html)
+Read more [about troubleshooting](troubleshoot)
## Giving Back
@@ -232,8 +232,8 @@ Read more [about troubleshooting](troubleshoot.html)
* Make your changes
* Send a pull request
-Read more [about the guts of Zombie.js](guts.html) and check out the
-outstanding [to-dos](todo.html).
+Read more [about the guts of Zombie.js](guts) and check out the
+outstanding [to-dos](todo).
## Brains
View
10 TODO.md
@@ -16,8 +16,6 @@ zombie.js-todo(7) -- Wishlist
context by copying properties to/from, which breaks asynchronous
scripts (timer, XHR, etc) which run in the contex, not the sandbox
-* Fix site links to not require `.html`.
-
* Navigation: Browser.open/close should work as a pair; look into supporting
window.open; fire unload event when navigating away from page.
@@ -27,3 +25,11 @@ zombie.js-todo(7) -- Wishlist
and timezone; allow changing browser timezone and default to system's.
* Prompts: handle window.confirm and window.alert.
+
+* Accessors for window.status, window title.
+
+* Accessor for HTTP status from last request, also pass back to visit method callback
+
+* Accessor to determine if last request was a redirect.
+
+* Support focus and blur events.
View
6 doc/API.md
@@ -64,7 +64,7 @@ To find out all the even rows in a table:
CSS selectors support is provied by
[Sizzle.js](https://github.com/jeresig/sizzle/wiki), the same engine
used by jQuery. You're probably familiar with it, if not, check the
-[list of supported selectors](selectors.html).
+[list of supported selectors](selectors).
### browser.body : Element
@@ -205,7 +205,7 @@ and resets before passing control to the callback. For example:
Methods for interacting with form controls (e.g. `fill`, `check`) take a
first argument that tries to identify the form control using a variety
of approaches. You can always select the form control using an
-appropriate [CSS selector](selectors.html), or pass the element itself.
+appropriate [CSS selector](selectors), or pass the element itself.
Zombie.js can also identify form controls using their name (the value of
the `name` attribute) or using the text of the label associated with
@@ -420,7 +420,7 @@ Emitted if an error occurred loading a page or submitting a form.
## Debugging
When trouble strikes, refer to these functions and the [troubleshooting
-guide](troubleshoot.html).
+guide](troubleshoot).
### browser.dump()
View
28 package.json
@@ -1,6 +1,6 @@
{
"name": "zombie",
- "version": "0.8.8",
+ "version": "0.8.9",
"description": "Insanely fast, full-stack, headless browser testing using Node.js",
"homepage": "http://zombie.labnotes.org/",
"author": "Assaf Arkin <assaf@labnotes.org> (http://labnotes.org/)",
@@ -21,7 +21,6 @@
"Cakefile",
"MIT-LICENSE",
"TODO.md",
- "package.json",
"dep",
"src",
"spec"
@@ -36,7 +35,7 @@
"dependencies": {
"base64": "1.0.1",
"cssom": "0.2.0",
- "html5": "0.2.10",
+ "html5": "0.2.12",
"jsdom": "0.1.23",
"mime": "1.1.0"
},
@@ -59,5 +58,28 @@
"type": "MIT",
"url": "http://github.com/assaf/zombie/raw/master/MIT-LICENSE"
}
+ ],
+ "modules": {
+ "index.js": "lib/index.js",
+ "zombie/bcat.js": "lib/zombie/bcat.js",
+ "zombie/browser.js": "lib/zombie/browser.js",
+ "zombie/cookies.js": "lib/zombie/cookies.js",
+ "zombie/eventloop.js": "lib/zombie/eventloop.js",
+ "zombie/forms.js": "lib/zombie/forms.js",
+ "zombie/history.js": "lib/zombie/history.js",
+ "zombie/jsdom_patches.js": "lib/zombie/jsdom_patches.js",
+ "zombie/protocol.js": "lib/zombie/protocol.js",
+ "zombie/storage.js": "lib/zombie/storage.js",
+ "zombie/xhr.js": "lib/zombie/xhr.js",
+ "zombie/xpath.js": "lib/zombie/xpath.js"
+ },
+ "man": [
+ "man7/api.7",
+ "man7/changelog.7",
+ "man7/guts.7",
+ "man7/selectors.7",
+ "man7/todo.7",
+ "man7/troubleshoot.7",
+ "man7/zombie.7"
]
}
View
4 spec/cookie-spec.coffee
@@ -9,7 +9,7 @@ brains.get "/cookies", (req, res)->
res.cookie "_expires4", "0s", "Max-Age": 0
res.cookie "_path1", "yummy", "Path": "/cookies"
res.cookie "_path2", "yummy", "Path": "/cookies/sub"
- res.cookie "_path3", "wrong", "Path": "/cookies/wrong"
+ res.cookie "_path3", "wrong", "Path": "/wrong"
res.cookie "_domain1", "here", "Domain": ".localhost"
res.cookie "_domain2", "not here", "Domain": "not.localhost"
res.cookie "_domain3", "wrong", "Domain": "notlocalhost"
@@ -39,7 +39,7 @@ vows.describe("Cookies").addBatch(
assert.equal cookies.get("_path1"), "yummy"
"should not have access to other paths": (cookies)->
assert.isUndefined cookies.get("_path2")
- assert.isUndefined cookies.get("_path2")
+ assert.isUndefined cookies.get("_path3")
"should not have access to .domain": (cookies)->
assert.equal cookies.get("_domain1"), "here"
"should not have access to other domains": (cookies)->
Please sign in to comment.
Something went wrong with that request. Please try again.