Browser should be able to submit forms

makeusabrew · Sep 19, 2012 · 61e8da9 · 61e8da9
1 parent 78376be
commit 61e8da9
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/lib/zombie/eventloop.coffee b/lib/zombie/eventloop.coffee
@@ -107,7 +107,7 @@ class EventLoop
     # Cleanup listeners and times before calling callback
     done = (error, timedOut)=>
       clearTimeout(timer)
-      @listeners.splice(@listeners.indexOf(listener), 1)
+      @listeners = @listeners.filter((l)-> l != listener)
       callback(error, !!timedOut)
 
     return

diff --git a/lib/zombie/forms.coffee b/lib/zombie/forms.coffee
@@ -65,7 +65,7 @@ HTML.HTMLFormElement.prototype.submit = (button)->
         data.push [button.name, button.value]
 
       document.window._submit
-        url:      HTML.resourceLoader.resolve(document, @getAttribute("action"))
+        url:      @getAttribute("action")
         method:   @getAttribute("method")
         encoding: @getAttribute("enctype")
         data:     data

diff --git a/lib/zombie/history.coffee b/lib/zombie/history.coffee
@@ -104,7 +104,7 @@ class History
   addEntry: (window, url, pushState)->
     url ||= window.location
     entry = new Entry(window, url, pushState)
-    this.updateLocation(window, url)
+    @updateLocation(window, url)
     @current.append(entry)
     @current = entry
     @focus(window)
@@ -113,7 +113,7 @@ class History
   replaceEntry: (window, url, pushState)->
     url ||= window.location
     entry = new Entry(window, url, pushState)
-    this.updateLocation(window, url)
+    @updateLocation(window, url)
     if @current == @first
       @current.dispose(window)
       @current = @first = entry
@@ -135,6 +135,22 @@ class History
   @prototype.__defineGetter__ "url", ->
     return @current?.url
 
+  # Form submission
+  submit: ({ url, method, encoding, data })->
+    window = @current.window
+    url = HTML.resourceLoader.resolve(window.document, url || "/")
+    params =
+      browser:  @browser
+      history:  this
+      name:     window.name
+      parent:   window.parent
+      url:      url
+      method:   method
+      encoding: encoding
+      data:     data
+    newWindow = createWindow(params)
+    @addEntry(newWindow, url)
+
 
   # -- Implementation of window.history --
 

diff --git a/lib/zombie/window.coffee b/lib/zombie/window.coffee
@@ -272,10 +272,7 @@ createWindow = ({ browser, data, encoding, history, method, name, opener, parent
   # Load the document associated with this window.
   loadDocument document: document, history: history, url: url, method: method, encoding: encoding, data: data
   # Form submission uses this
-  # FIXME
-  window._submit = ({ url, method, encoding, data })->
-    loadDocument document: document, history: history, url: url, method: method, encoding: encoding, data: data
-
+  window._submit = history.submit.bind(history)
   return window
 
 
@@ -362,7 +359,7 @@ loadDocument = ({ document, history, url, method, encoding, data })->
       request =
         url:      url
         method:   (method || "GET").toUpperCase() 
-        headers:  (headers && Object.create(headers)) || {}
+        headers:  (headers || {})
         data:     data
       if referer
         request.headers.referer = referer

diff --git a/test/cookies_test.coffee b/test/cookies_test.coffee
@@ -146,7 +146,7 @@ describe "Cookies", ->
       assert.equal @cookies.get("_expires4"), "3s"
 
 
-  describe.skip "duplicates", ->
+  describe "duplicates", ->
 
     before (done)->
       brains.get "/cookies2", (req, res)->

diff --git a/test/forms_test.coffee b/test/forms_test.coffee
@@ -698,7 +698,7 @@ describe "Forms", ->
 
 
   # Submitting form
-  describe.skip "submit form", ->
+  describe "submit form", ->
 
     describe "by calling submit", ->
       before (done)->
@@ -877,7 +877,7 @@ describe "Forms", ->
 
 
   # File upload
-  describe.skip "file upload", ->
+  describe "file upload", ->
     before ->
       brains.get "/forms/upload", (req, res)->
         res.send """
@@ -1046,7 +1046,7 @@ describe "Forms", ->
         assert.equal @browser.text("#is_file"), "true"
 
 
-  describe.skip "content length", ->
+  describe "content length", ->
     before ->
       brains.post "/forms/urlencoded", (req, res)->
         text = req.body.text