unpoly-rails 0.26.2 → 0.27.0

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

@@ -24,6 +24,16 @@ describe 'up.navigation', ->
         expect($currentLink).toHaveClass('up-current')
         expect($otherLink).not.toHaveClass('up-current')
 
+      it 'matches the current and destination URLs if they only differ by a trailing slash', ->
+        spyOn(up.browser, 'url').and.returnValue('/foo')
+        $currentLink = up.hello(affix('span[up-href="/foo/"]'))
+        expect($currentLink).toHaveClass('up-current')
+
+      it 'does not match the current and destination URLs if they differ in the search', ->
+        spyOn(up.browser, 'url').and.returnValue('/foo?q=1')
+        $currentLink = up.hello(affix('span[up-href="/foo?q=2"]'))
+        expect($currentLink).not.toHaveClass('up-current')
+
       it 'marks any link as .up-current if any of its space-separated up-alias values matches the current URL', ->
         spyOn(up.browser, 'url').and.returnValue('/foo')
         $currentLink = up.hello(affix('a[href="/x"][up-alias="/aaa /foo /bbb"]'))
@@ -102,11 +112,13 @@ describe 'up.navigation', ->
           expect($popupLink).toHaveClass('up-current')
           expect($unrelatedLink).not.toHaveClass('up-current')
 
-          up.popup.close().then ->
-            expect($backgroundLink).toHaveClass('up-current')
-            expect($popupLink).not.toHaveClass('up-current')
-            expect($unrelatedLink).not.toHaveClass('up-current')
-            done()
+          done()
+
+#          up.popup.close().then ->
+#            expect($backgroundLink).toHaveClass('up-current')
+#            expect($popupLink).not.toHaveClass('up-current')
+#            expect($unrelatedLink).not.toHaveClass('up-current')
+#            done()
 
         it 'changes .up-current marks as the URL changes'
 

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

@@ -77,75 +77,53 @@ describe 'up.popup', ->
 
       describe 'with { html } option', ->
 
-        it 'extracts the selector from the given HTML string', ->
+        it 'extracts the selector from the given HTML string', (done) ->
           $span = affix('span')
-          up.popup.attach($span, target: '.container', html: "<div class='container'>container contents</div>")
-          expect($('.up-popup')).toHaveText('container contents')
+          up.popup.attach($span, target: '.container', html: "<div class='container'>container contents</div>").then ->
+            expect($('.up-popup')).toHaveText('container contents')
+            done()
 
       describe 'opening a popup while another modal is open', ->
 
-        it 'does not open multiple popups or pad the body twice if the user starts loading a second popup before the first was done loading', (done) ->
-          $span = affix('span')
-          up.popup.config.closeDuration = 10
-          promise1 = up.popup.attach($span, url: '/path1', target: '.container', animation: 'fade-in', duration: 100)
-          promise2 = up.popup.attach($span, url: '/path2', target: '.container', animation: 'fade-in', duration: 100)
-          expect(jasmine.Ajax.requests.count()).toBe(2)
-          request1 = jasmine.Ajax.requests.at(0)
-          request2 = jasmine.Ajax.requests.at(1)
-
-          u.setTimer 10, =>
-            @respondWith('<div class="container">response1</div>', request: request1)
-            u.setTimer 10, =>
-              @respondWith('<div class="container">response2</div>', request: request2)
-              u.setTimer 30, =>
-                expect($('.up-popup').length).toBe(1)
-                expect($('.container')).toHaveText('response2')
-                done()
-
-        it 'closes the current popup and wait for its close animation to finish before starting the open animation of a second popup', (done) ->
-          $span = affix('span')
-          up.popup.config.openAnimation = 'fade-in'
-          up.popup.config.openDuration = 5
-          up.popup.config.closeAnimation = 'fade-out'
-          up.popup.config.closeDuration = 50
+        describeCapability 'canCssTransition', ->
 
-          events = []
-          u.each ['up:popup:open', 'up:popup:opened', 'up:popup:close', 'up:popup:closed'], (event) ->
-            up.on event, ->
-              events.push(event)
+          it 'closes the current popup and wait for its close animation to finish before starting the open animation of a second popup', (done) ->
+            $span = affix('span')
+            up.popup.config.openAnimation = 'fade-in'
+            up.popup.config.openDuration = 5
+            up.popup.config.closeAnimation = 'fade-out'
+            up.popup.config.closeDuration = 50
 
-          up.popup.attach($span, { target: '.target', html: '<div class="target">response1</div>' })
+            events = []
+            u.each ['up:popup:open', 'up:popup:opened', 'up:popup:close', 'up:popup:closed'], (event) ->
+              up.on event, -> events.push(event)
 
-          # First popup is starting opening animation
-          expect(events).toEqual ['up:popup:open']
-          expect($('.target')).toHaveText('response1')
+            up.popup.attach($span, { target: '.target', html: '<div class="target">response1</div>' })
 
-          u.setTimer 30, ->
-            # First popup has completed opening animation
-            expect(events).toEqual ['up:popup:open', 'up:popup:opened']
+            # First popup is starting opening animation
+            expect(events).toEqual ['up:popup:open']
             expect($('.target')).toHaveText('response1')
 
-            up.popup.attach($span, { target: '.target', html: '<div class="target">response2</div>' })
-
-            # First popup is starting close animation. Second popup waits for that.
-            expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:open', 'up:popup:close']
-            expect($('.target')).toHaveText('response1')
-
-            u.setTimer 15, ->
-
-              # Second popup is still waiting for first popup's closing animaton to finish.
-              expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:open', 'up:popup:close']
+            u.setTimer 30, ->
+              # First popup has completed opening animation
+              expect(events).toEqual ['up:popup:open', 'up:popup:opened']
               expect($('.target')).toHaveText('response1')
 
-              u.setTimer 100, ->
+              up.popup.attach($span, { target: '.target', html: '<div class="target">response2</div>' })
 
-                # First popup has finished closing, second popup has finished opening.
-                expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:open', 'up:popup:close', 'up:popup:closed', 'up:popup:opened']
-                expect($('.target')).toHaveText('response2')
+              u.setTimer 15, ->
 
-                done()
+                # Second popup is still waiting for first popup's closing animation to finish.
+                expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:close']
+                expect($('.target')).toHaveText('response1')
 
+                u.setTimer 100, ->
 
+                  # First popup has finished closing, second popup has finished opening.
+                  expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:close', 'up:popup:closed', 'up:popup:open', 'up:popup:opened']
+                  expect($('.target')).toHaveText('response2')
+
+                  done()
 
     describe 'up.popup.coveredUrl', ->
 
@@ -153,14 +131,14 @@ describe 'up.popup', ->
 
         it 'returns the URL behind the popup', (done) ->
           up.history.replace('/foo')
-          expect(up.popup.coveredUrl()).toBeUndefined()
+          expect(up.popup.coveredUrl()).toBeMissing()
 
           $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()
+            expect(up.popup.coveredUrl()).toBeMissing()
             done()
 
     describe 'up.popup.close', ->
@@ -178,7 +156,7 @@ describe 'up.popup', ->
       beforeEach ->
         @stubAttach = =>
           @$link = affix('a[href="/path"][up-popup=".target"]')
-          @attachSpy = up.popup.knife.mock('attach').and.returnValue(u.resolvedPromise())
+          @attachSpy = up.popup.knife.mock('attachAsap').and.returnValue(u.resolvedPromise())
           @defaultSpy = up.link.knife.mock('allowDefault').and.callFake((event) -> event.preventDefault())
 
       it 'opens the clicked link in a popup', ->
@@ -208,6 +186,30 @@ describe 'up.popup', ->
         Trigger.click(@$link, metaKey: true)
         expect(@attachSpy).not.toHaveBeenCalled()
 
+      it 'closes an existing popup before opening the new popup', ->
+
+        up.popup.config.openDuration = 0
+        up.popup.config.closeDuration = 0
+
+        $link1 = affix('a[href="/path1"][up-popup=".target"]')
+        $link2 = affix('a[href="/path2"][up-popup=".target"]')
+
+        events = []
+        u.each ['up:popup:open', 'up:popup:opened', 'up:popup:close', 'up:popup:closed'], (event) ->
+          up.on event, -> events.push(event)
+
+        Trigger.click($link1)
+        expect(events).toEqual ['up:popup:open']
+        @respondWith('<div class="target">text1</div>')
+        expect(events).toEqual ['up:popup:open', 'up:popup:opened']
+
+        Trigger.click($link2)
+        expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:close', 'up:popup:closed', 'up:popup:open']
+        @respondWith('<div class="target">text1</div>')
+
+        expect(events).toEqual ['up:popup:open', 'up:popup:opened', 'up:popup:close', 'up:popup:closed', 'up:popup:open', 'up:popup:opened']
+
+
       describe 'with [up-instant] modifier', ->
 
         beforeEach ->
@@ -255,20 +257,24 @@ describe 'up.popup', ->
 
       describe 'when clicked inside a popup', ->
 
-        it 'closes the open popup and prevents the default action', ->
-          $popup = affix('.up-popup')
-          $link = $popup.affix('a[up-close]') # link is within the popup
-          up.hello($link)
-          wasDefaultPrevented = false
-          wasClosed = false
-          up.on 'click', 'a[up-close]', (event) ->
-            wasDefaultPrevented = event.isDefaultPrevented()
-            true # the line above might return false and cancel propagation / prevent default
-          up.on 'up:popup:close', ->
-            wasClosed = true
-          $link.click()
-          expect(wasClosed).toBe(true)
-          expect(wasDefaultPrevented).toBe(true)
+        it 'closes the open popup and prevents the default action', (done) ->
+          $link = affix('a')
+          up.popup.attach($link, html: '<div class="target">text</div>', target: '.target').then ->
+            $popup = affix('.up-popup')
+            $link = $popup.affix('a[up-close]') # link is within the popup
+            up.hello($link)
+            wasDefaultPrevented = false
+            wasClosed = false
+            up.on 'click', 'a[up-close]', (event) ->
+              wasDefaultPrevented = event.isDefaultPrevented()
+              true # the line above might return false and cancel propagation / prevent default
+            up.on 'up:popup:close', ->
+              wasClosed = true
+            $link.click()
+            u.nextFrame ->
+              expect(wasClosed).toBe(true)
+              expect(wasDefaultPrevented).toBe(true)
+              done()
 
       describe 'when no popup is open', ->
 
@@ -336,3 +342,16 @@ describe 'up.popup', ->
         up.extract('.inside', "<div class='inside'>new inside</div>", origin: $('.outside'))
         expect($('.inside')).toHaveText('new inside')
         expect($('.up-popup')).toExist()
+
+    describe 'when clicking on the body', ->
+
+      beforeEach ->
+        up.motion.config.enabled = false
+
+      it 'closes a popup on mousedown (in case an [up-instant] link removes its parent and thus a click event never fires)', ->
+        affix('.outside').text('old outside')
+        $link = affix('.link')
+        up.popup.attach($link, href: '/path', target: '.inside')
+        @respondWith("<div class='inside'>inside</div>")
+        Trigger.mousedown($('body'))
+        expect($('.up-popup')).not.toExist()

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

@@ -2,6 +2,15 @@ describe 'up.util', ->
   
   describe 'Javascript functions', ->
 
+    describe 'up.util.cssAnimate', ->
+
+      it 'returns a deferred that eventually resolves if called with a duration of 0 (bugfix)', (done) ->
+        $element = affix('.element')
+        promise = up.util.cssAnimate($element, { 'font-size': '90px' }, { duration: 0 })
+        promise.then ->
+          expect('done').toEqual('done') # need an expectation of Jasmine will complain
+          done()
+
     describe 'up.util.isFixed', ->
 
       it 'returns true if the given element or one of its ancestors has a "fixed" CSS position', ->
@@ -286,6 +295,20 @@ describe 'up.util', ->
         string = up.util.requestDataAsQuery({ 'my+key': 'my+value' })
         expect(string).toEqual('my%2Bkey=my%2Bvalue')
 
+    describe 'up.util.unresolvableDeferred', ->
+      
+      it 'returns a different object every time (to prevent memory leaks)', ->
+        one = up.util.unresolvableDeferred()
+        two = up.util.unresolvableDeferred()
+        expect(one).not.toBe(two)
+
+    describe 'up.util.unresolvablePromise', ->
+      
+      it 'returns a different object every time (to prevent memory leaks)', ->
+        one = up.util.unresolvablePromise()
+        two = up.util.unresolvablePromise()
+        expect(one).not.toBe(two)
+
     describe 'up.util.resolvableWhen', ->
 
       it 'returns a promise that is resolved when all the given deferreds are resolved', ->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,8 @@ files:
 - spec_app/app/helpers/application_helper.rb
 - spec_app/app/mailers/.keep
 - spec_app/app/models/concerns/.keep
+- spec_app/app/views/css_test/modal.erb
+- spec_app/app/views/css_test/modal_contents.erb
 - spec_app/app/views/css_test/popup.erb
 - spec_app/app/views/css_test/popup_contents.erb
 - spec_app/app/views/css_test/tooltip.erb