upjs-rails 0.13.0 → 0.14.0

data/lib/upjs/rails/version.rb

@@ -4,6 +4,6 @@ module Upjs
     # The current version of the upjs-rails gem.
     # This version number is also used for releases of the Up.js
     # frontend code.
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
   end
 end

data/spec_app/Gemfile

@@ -12,6 +12,12 @@ gem 'jquery-rails'
 gem 'upjs-rails', path: '..'
 gem 'bower-rails'
 
+# Jasmine spec runner won't boot with a more modern version of sprockets.
+# It crashes with an "asset not precompiled" error.
+gem 'tilt', '=1.4.1'
+gem 'sprockets-rails', '=2.2.4'
+gem 'sprockets', '=2.12.3'
+
 group :development, :test do
   gem 'byebug'
   gem 'web-console', '~> 2.0'

data/spec_app/Gemfile.lock

@@ -67,7 +67,6 @@ GEM
       execjs
     coffee-script-source (1.8.0)
     columnize (0.9.0)
-    concurrent-ruby (1.0.0)
     cucumber (1.3.16)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -98,6 +97,7 @@ GEM
       haml (>= 3.1, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
+    hike (1.2.3)
     hpricot (0.8.6)
     html2haml (1.0.1)
       erubis (~> 2.7.0)
@@ -105,11 +105,11 @@ GEM
       hpricot (~> 0.8.6)
       ruby_parser (~> 3.1.1)
     i18n (0.7.0)
-    jasmine-core (2.2.0)
-    jasmine-rails (0.10.7)
+    jasmine-core (2.4.1)
+    jasmine-rails (0.12.2)
       jasmine-core (>= 1.3, < 3.0)
-      phantomjs (< 2.0)
-      railties (>= 3.1.0)
+      phantomjs (>= 1.9)
+      railties (>= 3.2.0)
       sprockets-rails
     jquery-rails (4.0.2)
       rails-dom-testing (~> 1.0)
@@ -196,20 +196,22 @@ GEM
       capybara
       cucumber
       cucumber-rails
-    sprockets (3.5.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.0.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.6.0)
@@ -241,8 +243,11 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   selenium-webdriver
   spreewald
+  sprockets (= 2.12.3)
+  sprockets-rails (= 2.2.4)
   sqlite3
   therubyracer
+  tilt (= 1.4.1)
   uglifier (>= 1.3.0)
   upjs-rails!
   web-console (~> 2.0)

data/spec_app/spec/javascripts/helpers/to_end_with.js.coffee

@@ -1,5 +1,8 @@
+endsWith = (string, substring) ->
+  string.indexOf(substring) == string.length - substring.length
+
 beforeEach ->
   jasmine.addMatchers
     toEndWith: (util, customEqualityTesters) ->
       compare: (actual, expected) ->
-        pass: up.util.endsWith(actual, expected)
+        pass: endsWith(actual, expected)

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

@@ -187,7 +187,6 @@ describe 'up.proxy', ->
           expect(up.proxy.busy()).toBe(false)
 
         it 'can delay the up:proxy:busy event to prevent flickering of spinners', ->
-          jasmine.clock().install()
           up.proxy.config.busyDelay = 100
 
           up.proxy.ajax(url: '/foo')
@@ -219,7 +218,6 @@ describe 'up.proxy', ->
           ])
 
         it 'does not emit up:proxy:idle if a delayed up:proxy:busy was never emitted due to a fast response', ->
-          jasmine.clock().install()
           up.proxy.config.busyDelay = 100
 
           up.proxy.ajax(url: '/foo')

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

@@ -8,27 +8,27 @@ describe 'up.util', ->
 #        fun = ($element, data) ->
 #        expect(up.util.argNames(fun)).toEqual(['$element', 'data'])
 
-    describe 'up.util.createSelectorFromElement', ->
+    describe 'up.util.selectorForElement', ->
 
       it "prefers using the element's 'up-id' attribute to using the element's ID", ->
         $element = affix('div[up-id=up-id-value]#id-value')
-        expect(up.util.createSelectorFromElement($element)).toBe("[up-id='up-id-value']")
+        expect(up.util.selectorForElement($element)).toBe("[up-id='up-id-value']")
 
       it "prefers using the element's ID to using the element's name", ->
         $element = affix('div#id-value[name=name-value]')
-        expect(up.util.createSelectorFromElement($element)).toBe("#id-value")
+        expect(up.util.selectorForElement($element)).toBe("#id-value")
 
       it "prefers using the element's name to using the element's classes", ->
         $element = affix('div[name=name-value].class1.class2')
-        expect(up.util.createSelectorFromElement($element)).toBe("[name='name-value']")
+        expect(up.util.selectorForElement($element)).toBe("[name='name-value']")
 
       it "prefers using the element's classes to using the element's tag name", ->
         $element = affix('div.class1.class2')
-        expect(up.util.createSelectorFromElement($element)).toBe(".class1.class2")
+        expect(up.util.selectorForElement($element)).toBe(".class1.class2")
 
       it "uses the element's tag name if no better description is available", ->
         $element = affix('div')
-        expect(up.util.createSelectorFromElement($element)).toBe("div")
+        expect(up.util.selectorForElement($element)).toBe("div")
 
 
     describe 'up.util.castedAttr', ->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails