upjs-rails 0.17.0 → 0.18.0

data/spec_app/spec/javascripts/up/history_spec.js.coffee

@@ -14,7 +14,7 @@ describe 'up.history', ->
 
     describe '[up-back]', ->
 
-      if up.browser.canPushState()
+      describeCapability 'canPushState', ->
 
         it 'sets an [up-href] attribute to the previous URL and sets the up-restore-scroll attribute to "true"', ->
           up.history.push('/one')
@@ -29,9 +29,15 @@ describe 'up.history', ->
 
       it 'does not set an up-href attribute if there is no previous URL'
 
+    describeFallback 'canPushState', ->
+
+      it 'does not change the element', ->
+        $element = up.hello(affix('a[href="/three"][up-back]').text('text'))
+        expect($element.attr('up-href')).toBeUndefined()
+
     describe 'scroll restauration', ->
 
-      if up.browser.canPushState()
+      describeCapability 'canPushState', ->
 
         afterEach ->
           $('.viewport').remove()

data/spec_app/spec/javascripts/up/link_spec.js.coffee

@@ -5,8 +5,8 @@ describe 'up.link', ->
   describe 'Javascript functions', ->
   
     describe 'up.follow', ->
-      
-      if up.browser.canPushState()
+
+      describeCapability 'canPushState', ->
 
         it 'loads the given link via AJAX and replaces the response in the given target', (done) ->
           affix('.before').text('old-before')
@@ -32,7 +32,7 @@ describe 'up.link', ->
           $link = affix('a[href="/path"][data-method="PUT"]')
           up.follow($link)
           request = @lastRequest()
-          expect(request.method).toBe('PUT')
+          expect(request).toHaveRequestMethod('PUT')
 
         it 'allows to refer to the link itself as "&" in the CSS selector', ->
           $container = affix('div')
@@ -142,7 +142,26 @@ describe 'up.link', ->
 #
 #          it "doesn't make a request and reveals the target of a #hash in the URL"
 
-      else
+        describe 'with { confirm } option', ->
+
+          it 'follows the link after the user OKs a confirmation dialog', ->
+            deferred = $.Deferred()
+            spyOn(up.browser, 'confirm').and.returnValue(deferred)
+            spyOn(up, 'replace')
+            $link = affix('a[href="/danger"][up-target=".middle"]')
+            up.follow($link, confirm: 'Do you really want to go there?')
+            expect(up.browser.confirm).toHaveBeenCalledWith('Do you really want to go there?')
+            expect(up.replace).not.toHaveBeenCalled()
+            deferred.resolve()
+            expect(up.replace).toHaveBeenCalled()
+
+          it 'does not show a confirmation dialog if the option is not a present string', ->
+            spyOn(up, 'replace')
+            $link = affix('a[href="/danger"][up-target=".middle"]')
+            up.follow($link, confirm: '')
+            expect(up.replace).toHaveBeenCalled()
+
+      describeFallback 'canPushState', ->
         
         it 'follows the given link', ->
           $link = affix('a[href="/path"]')
@@ -172,23 +191,25 @@ describe 'up.link', ->
         $form.click()
         expect(followSpy).not.toHaveBeenCalled()
 
-      it 'adds a history entry', ->
-        affix('.target')
-        $link = affix('a[href="/path"][up-target=".target"]')
-        $link.click()
-        @respondWith('<div class="target">new text</div>')
-        expect($('.target')).toHaveText('new text')
-        expect(location.pathname).toEqual('/path')
-
-      it 'respects a X-Up-Location header that the server sends in case of a redirect', ->
-        affix('.target')
-        $link = affix('a[href="/path"][up-target=".target"]')
-        $link.click()
-        @respondWith
-          responseText: '<div class="target">new text</div>'
-          responseHeaders: { 'X-Up-Location': '/other/path' }
-        expect($('.target')).toHaveText('new text')
-        expect(location.pathname).toEqual('/other/path')
+      describeCapability 'canPushState', ->
+
+        it 'adds a history entry', ->
+          affix('.target')
+          $link = affix('a[href="/path"][up-target=".target"]')
+          $link.click()
+          @respondWith('<div class="target">new text</div>')
+          expect($('.target')).toHaveText('new text')
+          expect(location.pathname).toEqual('/path')
+
+        it 'respects a X-Up-Location header that the server sends in case of a redirect', ->
+          affix('.target')
+          $link = affix('a[href="/path"][up-target=".target"]')
+          $link.click()
+          @respondWith
+            responseText: '<div class="target">new text</div>'
+            responseHeaders: { 'X-Up-Location': '/other/path' }
+          expect($('.target')).toHaveText('new text')
+          expect(location.pathname).toEqual('/other/path')
 
       it 'does not add a history entry when an up-history attribute is set to "false"', ->
         oldPathname = location.pathname
@@ -212,9 +233,11 @@ describe 'up.link', ->
         Trigger.click(@$link)
         expect(@followSpy).toHaveBeenCalledWith(@$link)
 
-      it 'does nothing if the right mouse button is used', ->
-        Trigger.click(@$link, button: 2)
-        expect(@followSpy).not.toHaveBeenCalled()
+      # IE does not call Javascript and always performs the default action on right clicks
+      unless navigator.userAgent.match(/Trident/)
+        it 'does nothing if the right mouse button is used', ->
+          Trigger.click(@$link, button: 2)
+          expect(@followSpy).not.toHaveBeenCalled()
 
       it 'does nothing if shift is pressed during the click', ->
         Trigger.click(@$link, shiftKey: true)
@@ -224,9 +247,9 @@ describe 'up.link', ->
         Trigger.click(@$link, ctrlKey: true)
         expect(@followSpy).not.toHaveBeenCalled()
 
-#      it 'does nothing if meta is pressed during the click', ->
-#        Trigger.click(@$link, metaKey: true)
-#        expect(@followSpy).not.toHaveBeenCalled()
+      it 'does nothing if meta is pressed during the click', ->
+        Trigger.click(@$link, metaKey: true)
+        expect(@followSpy).not.toHaveBeenCalled()
 
       describe 'with [up-instant] modifier', ->
 
@@ -245,9 +268,11 @@ describe 'up.link', ->
           Trigger.click(@$link)
           expect(@followSpy).not.toHaveBeenCalled()
 
-        it 'does nothing if the right mouse button is pressed down', ->
-          Trigger.mousedown(@$link, button: 2)
-          expect(@followSpy).not.toHaveBeenCalled()
+        # IE does not call Javascript and always performs the default action on right clicks
+        unless navigator.userAgent.match(/Trident/)
+          it 'does nothing if the right mouse button is pressed down', ->
+            Trigger.mousedown(@$link, button: 2)
+            expect(@followSpy).not.toHaveBeenCalled()
 
         it 'does nothing if shift is pressed during mousedown', ->
           Trigger.mousedown(@$link, shiftKey: true)
@@ -275,6 +300,13 @@ describe 'up.link', ->
         up.hello($area)
         expect($area.attr('up-href')).toEqual('/path')
 
+      it 'copies attributes from the first link if there are multiple links', ->
+        $area = affix('div[up-expand]')
+        $link1 = $area.affix('a[href="/path1"]')
+        $link2 = $area.affix('a[href="/path2"]')
+        up.hello($area)
+        expect($area.attr('up-href')).toEqual('/path1')
+
       it "copies an contained non-link element with up-href attribute", ->
         $area = affix('div[up-expand] span[up-follow][up-href="/path"]')
         up.hello($area)
@@ -285,3 +317,24 @@ describe 'up.link', ->
         up.hello($area)
         expect($area.attr('up-follow')).toEqual('')
 
+      describe 'with a CSS selector in the property value', ->
+
+        it "expands the contained link that matches the selector", ->
+          $area = affix('div[up-expand=".second"]')
+          $link1 = $area.affix('a.first[href="/path1"]')
+          $link2 = $area.affix('a.second[href="/path2"]')
+          up.hello($area)
+          expect($area.attr('up-href')).toEqual('/path2')
+
+        it 'does nothing if no contained link matches the selector', ->
+          $area = affix('div[up-expand=".foo"]')
+          $link = $area.affix('a[href="/path1"]')
+          up.hello($area)
+          expect($area.attr('up-href')).toBeUndefined()
+
+        it 'does not match an element that is not a descendant', ->
+          $area = affix('div[up-expand=".second"]')
+          $link1 = $area.affix('a.first[href="/path1"]')
+          $link2 = affix('a.second[href="/path2"]') # not a child of $area
+          up.hello($area)
+          expect($area.attr('up-href')).toBeUndefined()

data/spec_app/spec/javascripts/up/modal_spec.js.coffee

@@ -75,15 +75,17 @@ describe 'up.modal', ->
 
     describe 'up.modal.coveredUrl', ->
 
-      it 'returns the URL behind the modal overlay', (done) ->
-        up.history.replace('/foo')
-        expect(up.modal.coveredUrl()).toBeUndefined()
-        up.modal.visit('/bar', target: '.container')
-        @respondWith('<div class="container">text</div>')
-        expect(up.modal.coveredUrl()).toEndWith('/foo')
-        up.modal.close().then ->
+      describeCapability 'canPushState', ->
+
+        it 'returns the URL behind the modal overlay', (done) ->
+          up.history.replace('/foo')
           expect(up.modal.coveredUrl()).toBeUndefined()
-          done()
+          up.modal.visit('/bar', target: '.container')
+          @respondWith('<div class="container">text</div>')
+          expect(up.modal.coveredUrl()).toEndWith('/foo')
+          up.modal.close().then ->
+            expect(up.modal.coveredUrl()).toBeUndefined()
+            done()
 
 
     describe 'up.modal.close', ->
@@ -109,9 +111,11 @@ describe 'up.modal', ->
         Trigger.click(@$link)
         expect(@followSpy).toHaveBeenCalledWith(@$link)
 
-      it 'does nothing if the right mouse button is used', ->
-        Trigger.click(@$link, button: 2)
-        expect(@followSpy).not.toHaveBeenCalled()
+      # IE does not call Javascript and always performs the default action on right clicks
+      unless navigator.userAgent.match(/Trident/)
+        it 'does nothing if the right mouse button is used', ->
+          Trigger.click(@$link, button: 2)
+          expect(@followSpy).not.toHaveBeenCalled()
 
       it 'does nothing if shift is pressed during the click', ->
         Trigger.click(@$link, shiftKey: true)
@@ -121,9 +125,9 @@ describe 'up.modal', ->
         Trigger.click(@$link, ctrlKey: true)
         expect(@followSpy).not.toHaveBeenCalled()
 
-#      it 'does nothing if meta is pressed during the click', ->
-#        Trigger.click(@$link, metaKey: true)
-#        expect(@followSpy).not.toHaveBeenCalled()
+      it 'does nothing if meta is pressed during the click', ->
+        Trigger.click(@$link, metaKey: true)
+        expect(@followSpy).not.toHaveBeenCalled()
 
       describe 'with [up-instant] modifier', ->
 
@@ -142,9 +146,11 @@ describe 'up.modal', ->
           Trigger.click(@$link)
           expect(@followSpy).not.toHaveBeenCalled()
 
-        it 'does nothing if the right mouse button is pressed down', ->
-          Trigger.mousedown(@$link, button: 2)
-          expect(@followSpy).not.toHaveBeenCalled()
+        # IE does not call Javascript and always performs the default action on right clicks
+        unless navigator.userAgent.match(/Trident/)
+          it 'does nothing if the right mouse button is pressed down', ->
+            Trigger.mousedown(@$link, button: 2)
+            expect(@followSpy).not.toHaveBeenCalled()
 
         it 'does nothing if shift is pressed during mousedown', ->
           Trigger.mousedown(@$link, shiftKey: true)

data/spec_app/spec/javascripts/up/motion_spec.js.coffee

@@ -4,7 +4,7 @@ describe 'up.motion', ->
   
     describe 'up.animate', ->
 
-      if up.browser.canCssTransition()
+      describeCapability 'canCssTransition', ->
 
         it 'animates the given element', (done) ->
           $element = affix('.element').text('content')
@@ -35,7 +35,7 @@ describe 'up.motion', ->
             up.animate($element, { 'font-size': '40px' }, duration: 10000, easing: 'linear')
             expect($element.css('font-size')).toEqual('40px')
 
-      else
+      describeFallback 'canCssTransition', ->
 
         it "doesn't animate and directly sets the last frame instead", ->
           $element = affix('.element').text('content')
@@ -45,7 +45,7 @@ describe 'up.motion', ->
 
     describe 'up.morph', ->
 
-      if up.browser.canCssTransition()
+      describeCapability 'canCssTransition', ->
 
         it 'transitions between two element by animating two copies while keeping the originals in the background', (done) ->
 
@@ -209,7 +209,7 @@ describe 'up.motion', ->
             expect($new).toBeVisible()
             expect($new.css('opacity')).toEqual('1')
 
-      else
+      describeFallback 'canCssTransition', ->
 
         it "doesn't animate and hides the old element instead", ->
           $old = affix('.old').text('old content')

data/spec_app/spec/javascripts/up/navigation_spec.js.coffee

@@ -44,7 +44,7 @@ describe 'up.navigation', ->
       $currentLink = up.hello(affix('a[href="/foo"]'))
       expect($currentLink).toHaveClass('highlight up-current')
 
-    if up.browser.canPushState()
+    describeCapability 'canPushState', ->
       
       it 'marks a link as .up-current if it links to the current URL, but is missing a trailing slash', ->
         $link = affix('a[href="/foo"][up-target=".main"]')

data/spec_app/spec/javascripts/up/popup_spec.js.coffee

@@ -45,17 +45,19 @@ describe 'up.popup', ->
 
     describe 'up.popup.coveredUrl', ->
 
-      it 'returns the URL behind the popup', (done) ->
-        up.history.replace('/foo')
-        expect(up.popup.coveredUrl()).toBeUndefined()
-
-        $popupLink = affix('a[href="/bar"][up-popup=".container"]')
-        $popupLink.click()
-        @respondWith('<div class="container">text</div>')
-        expect(up.popup.coveredUrl()).toEndWith('/foo')
-        up.popup.close().then ->
+      describeCapability 'canPushState', ->
+
+        it 'returns the URL behind the popup', (done) ->
+          up.history.replace('/foo')
           expect(up.popup.coveredUrl()).toBeUndefined()
-          done()
+
+          $popupLink = affix('a[href="/bar"][up-popup=".container"]')
+          $popupLink.click()
+          @respondWith('<div class="container">text</div>')
+          expect(up.popup.coveredUrl()).toEndWith('/foo')
+          up.popup.close().then ->
+            expect(up.popup.coveredUrl()).toBeUndefined()
+            done()
 
     describe 'up.popup.close', ->
 
@@ -78,9 +80,11 @@ describe 'up.popup', ->
         Trigger.click(@$link)
         expect(@attachSpy).toHaveBeenCalledWith(@$link)
 
-      it 'does nothing if the right mouse button is used', ->
-        Trigger.click(@$link, button: 2)
-        expect(@attachSpy).not.toHaveBeenCalled()
+      # IE does not call Javascript and always performs the default action on right clicks
+      unless navigator.userAgent.match(/Trident/)
+        it 'does nothing if the right mouse button is used', ->
+          Trigger.click(@$link, button: 2)
+          expect(@attachSpy).not.toHaveBeenCalled()
 
       it 'does nothing if shift is pressed during the click', ->
         Trigger.click(@$link, shiftKey: true)
@@ -90,6 +94,10 @@ describe 'up.popup', ->
         Trigger.click(@$link, ctrlKey: true)
         expect(@attachSpy).not.toHaveBeenCalled()
 
+      it 'does nothing if meta is pressed during the click', ->
+        Trigger.click(@$link, metaKey: true)
+        expect(@attachSpy).not.toHaveBeenCalled()
+
       describe 'with [up-instant] modifier', ->
 
         beforeEach ->
@@ -107,9 +115,11 @@ describe 'up.popup', ->
           Trigger.click(@$link)
           expect(@attachSpy).not.toHaveBeenCalled()
 
-        it 'does nothing if the right mouse button is pressed down', ->
-          Trigger.mousedown(@$link, button: 2)
-          expect(@attachSpy).not.toHaveBeenCalled()
+        # IE does not call Javascript and always performs the default action on right clicks
+        unless navigator.userAgent.match(/Trident/)
+          it 'does nothing if the right mouse button is pressed down', ->
+            Trigger.mousedown(@$link, button: 2)
+            expect(@attachSpy).not.toHaveBeenCalled()
 
         it 'does nothing if shift is pressed during mousedown', ->
           Trigger.mousedown(@$link, shiftKey: true)

data/spec_app/spec/javascripts/up/proxy_spec.js.coffee

@@ -41,26 +41,26 @@ describe 'up.proxy', ->
         expect(responses).toEqual(['foo', 'foo', 'bar'])
 
       it "doesn't reuse responses when asked for the same path, but different selectors", ->
-        up.proxy.ajax(url: '/path', selector: '.a')
-        up.proxy.ajax(url: '/path', selector: '.b')
+        up.proxy.ajax(url: '/path', target: '.a')
+        up.proxy.ajax(url: '/path', target: '.b')
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
       it "reuses a response for an 'html' selector when asked for the same path and any other selector", ->
-        up.proxy.ajax(url: '/path', selector: 'html')
-        up.proxy.ajax(url: '/path', selector: 'body')
-        up.proxy.ajax(url: '/path', selector: 'p')
-        up.proxy.ajax(url: '/path', selector: '.klass')
+        up.proxy.ajax(url: '/path', target: 'html')
+        up.proxy.ajax(url: '/path', target: 'body')
+        up.proxy.ajax(url: '/path', target: 'p')
+        up.proxy.ajax(url: '/path', target: '.klass')
         expect(jasmine.Ajax.requests.count()).toEqual(1)
 
       it "reuses a response for a 'body' selector when asked for the same path and any other selector other than 'html'", ->
-        up.proxy.ajax(url: '/path', selector: 'body')
-        up.proxy.ajax(url: '/path', selector: 'p')
-        up.proxy.ajax(url: '/path', selector: '.klass')
+        up.proxy.ajax(url: '/path', target: 'body')
+        up.proxy.ajax(url: '/path', target: 'p')
+        up.proxy.ajax(url: '/path', target: '.klass')
         expect(jasmine.Ajax.requests.count()).toEqual(1)
 
       it "doesn't reuse a response for a 'body' selector when asked for the same path but an 'html' selector", ->
-        up.proxy.ajax(url: '/path', selector: 'body')
-        up.proxy.ajax(url: '/path', selector: 'html')
+        up.proxy.ajax(url: '/path', target: 'body')
+        up.proxy.ajax(url: '/path', target: 'html')
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
       it "doesn't reuse responses for different paths", ->
@@ -101,11 +101,43 @@ describe 'up.proxy', ->
 
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
+      describe 'with config.wrapMethods set', ->
+
+        it 'should be set by default', ->
+          expect(up.proxy.config.wrapMethods).toBePresent()
+
+#        beforeEach ->
+#          @oldWrapMethod = up.proxy.config.wrapMethod
+#          up.proxy.config.wrapMethod = true
+#
+#        afterEach ->
+#          up.proxy.config.wrapMethod = @oldWrapMetod
+
+        u.each ['GET', 'POST', 'HEAD', 'OPTIONS'], (method) ->
+
+          it "does not change the method of a #{method} request", ->
+            up.proxy.ajax(url: '/foo', method: method)
+            request = @lastRequest()
+            expect(request.method).toEqual(method)
+            expect(request.data()['_method']).toBeUndefined()
+
+        u.each ['PUT', 'PATCH', 'DELETE'], (method) ->
+
+          it "turns a #{method} request into a POST request and sends the actual method as a { _method } param", ->
+            up.proxy.ajax(url: '/foo', method: method)
+            request = @lastRequest()
+            expect(request.method).toEqual('POST')
+            expect(request.data()['_method']).toEqual([method])
+
       describe 'with config.maxRequests set', ->
 
         beforeEach ->
+          @oldMaxRequests = up.proxy.config.maxRequests
           up.proxy.config.maxRequests = 1
 
+        afterEach ->
+          up.proxy.config.maxRequests = @oldMaxRequests
+
         it 'limits the number of concurrent requests', ->
           responses = []
           up.proxy.ajax(url: '/foo').then (html) -> responses.push(html)
@@ -283,7 +315,7 @@ describe 'up.proxy', ->
 
     describe 'up.proxy.preload', ->
 
-      if up.browser.canPushState()
+      describeCapability 'canPushState', ->
 
         it "loads and caches the given link's destination", ->
           $link = affix('a[href="/path"]')
@@ -295,7 +327,7 @@ describe 'up.proxy', ->
           up.proxy.preload($link)
           expect(up.proxy.get(url: '/path')).toBeUndefined()
 
-      else
+      describeFallback 'canPushState', ->
 
         it "does nothing", ->
           $link = affix('a[href="/path"]')