upjs-rails 0.12.5 → 0.13.0

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

@@ -22,10 +22,7 @@ describe 'up.proxy', ->
         expect(jasmine.Ajax.requests.count()).toEqual(1)
         expect(responses).toEqual([])
 
-        @lastRequest().respondWith
-          status: 200
-          contentType: 'text/html'
-          responseText: 'foo'
+        @respondWith('foo')
 
         # See that both requests have been fulfilled by the same response
         expect(responses).toEqual(['foo', 'foo'])
@@ -39,33 +36,37 @@ describe 'up.proxy', ->
         # See that we have triggered a second request
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
-        @lastRequest().respondWith
-          status: 200
-          contentType: 'text/html'
-          responseText: 'bar'
+        @respondWith('bar')
 
         expect(responses).toEqual(['foo', 'foo', 'bar'])
 
-      it "doesn't reuse responses for different paths", ->
-        responses = []
-
-        up.proxy.ajax(url: '/foo').then (data) -> responses.push(data)
-        up.proxy.ajax(url: '/bar').then (data) -> responses.push(data)
-
-        # See that only a single network request was triggered
+      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')
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
-        jasmine.Ajax.requests.at(0).respondWith
-          status: 200
-          contentType: 'text/html'
-          responseText: 'foo'
+      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')
+        expect(jasmine.Ajax.requests.count()).toEqual(1)
 
-        jasmine.Ajax.requests.at(1).respondWith
-          status: 200
-          contentType: 'text/html'
-          responseText: 'bar'
+      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')
+        expect(jasmine.Ajax.requests.count()).toEqual(1)
 
-        expect(responses).toEqual(['foo', 'bar'])
+      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')
+        expect(jasmine.Ajax.requests.count()).toEqual(2)
+
+      it "doesn't reuse responses for different paths", ->
+        up.proxy.ajax(url: '/foo')
+        up.proxy.ajax(url: '/bar')
+        expect(jasmine.Ajax.requests.count()).toEqual(2)
 
       u.each ['GET', 'HEAD', 'OPTIONS'], (method) ->
 
@@ -91,7 +92,7 @@ describe 'up.proxy', ->
         # Send the same request for the same path, 3 minutes apart
         up.proxy.ajax(url: '/foo')
 
-        @lastRequest().respondWith
+        @respondWith
           status: 500
           contentType: 'text/html'
           responseText: 'foo'

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

@@ -8,6 +8,29 @@ describe 'up.util', ->
 #        fun = ($element, data) ->
 #        expect(up.util.argNames(fun)).toEqual(['$element', 'data'])
 
+    describe 'up.util.createSelectorFromElement', ->
+
+      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']")
+
+      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")
+
+      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']")
+
+      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")
+
+      it "uses the element's tag name if no better description is available", ->
+        $element = affix('div')
+        expect(up.util.createSelectorFromElement($element)).toBe("div")
+
+
     describe 'up.util.castedAttr', ->
 
       it 'returns true if the attribute value is the string "true"', ->

data/spec_app/spec/spec_helper.rb

@@ -0,0 +1,62 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+# Checks for pending migration and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rdoc_options"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -79,6 +80,7 @@ files:
 - design/ghost-debugging.txt
 - design/homepage.txt
 - design/rename.txt
+- design/up-validate.js.coffee
 - dist/up-bootstrap.css
 - dist/up-bootstrap.js
 - dist/up-bootstrap.min.css
@@ -88,6 +90,7 @@ files:
 - dist/up.min.css
 - dist/up.min.js
 - lib/assets/javascripts/up-bootstrap.js.coffee
+- lib/assets/javascripts/up-bootstrap/form-ext.js.coffee
 - lib/assets/javascripts/up-bootstrap/layout-ext.js.coffee
 - lib/assets/javascripts/up-bootstrap/modal-ext.js.coffee
 - lib/assets/javascripts/up-bootstrap/navigation-ext.js.coffee
@@ -119,12 +122,14 @@ files:
 - lib/assets/stylesheets/up/tooltip.css.sass
 - lib/upjs-rails.rb
 - lib/upjs/rails/engine.rb
+- lib/upjs/rails/inspector.rb
+- lib/upjs/rails/inspector_accessor.rb
 - lib/upjs/rails/request_echo_headers.rb
-- lib/upjs/rails/request_ext.rb
 - lib/upjs/rails/request_method_cookie.rb
 - lib/upjs/rails/version.rb
 - spec_app/.firefox-version
 - spec_app/.gitignore
+- spec_app/.rspec
 - spec_app/Bowerfile
 - spec_app/Gemfile
 - spec_app/Gemfile.lock
@@ -142,6 +147,7 @@ files:
 - spec_app/app/controllers/cards_controller.rb
 - spec_app/app/controllers/concerns/.keep
 - spec_app/app/controllers/pages_controller.rb
+- spec_app/app/controllers/test_controller.rb
 - spec_app/app/helpers/application_helper.rb
 - spec_app/app/mailers/.keep
 - spec_app/app/models/card.rb
@@ -200,6 +206,8 @@ files:
 - spec_app/public/favicon.ico
 - spec_app/public/robots.txt
 - spec_app/script/cucumber
+- spec_app/spec/controllers/test_controller_spec.rb
+- spec_app/spec/javascripts/helpers/append_fixture.js.coffee
 - spec_app/spec/javascripts/helpers/index.js.coffee
 - spec_app/spec/javascripts/helpers/knife.js.coffee
 - spec_app/spec/javascripts/helpers/last_request.js.coffee
@@ -229,6 +237,7 @@ files:
 - spec_app/spec/javascripts/up/syntax_spec.js.coffee
 - spec_app/spec/javascripts/up/tooltip_spec.js.coffee
 - spec_app/spec/javascripts/up/util_spec.js.coffee
+- spec_app/spec/spec_helper.rb
 - spec_app/test/controllers/.keep
 - spec_app/test/fixtures/.keep
 - spec_app/test/helpers/.keep

data/lib/upjs/rails/request_ext.rb

@@ -1,13 +0,0 @@
-module Upjs
-  module Rails
-    module Request
-
-      def up?
-        headers['X-Up-Selector'].present?
-      end
-
-      ActionDispatch::Request.send(:include, self)
-
-    end
-  end
-end