solidus_core 1.1.4 → 1.2.0.beta1

data/spec/models/spree/taxon_spec.rb

@@ -44,7 +44,7 @@ describe Spree::Taxon, :type => :model do
         expect(taxon.permalink).to eql "brands/wo"
       end
 
-      # Regression test for #3390
+      # Regression test for https://github.com/spree/spree/issues/3390
       context "setting a new node sibling position via :child_index=" do
         let(:idx) { rand(0..100) }
         before { allow(parent).to receive(:move_to_child_with_index) }
@@ -63,12 +63,12 @@ describe Spree::Taxon, :type => :model do
     end
   end
 
-  # Regression test for #2620
+  # Regression test for https://github.com/spree/spree/issues/2620
   context "creating a child node using first_or_create" do
     let(:taxonomy) { create(:taxonomy) }
 
     it "does not error out" do
-      expect { taxonomy.root.children.unscoped.where(:name => "Some name").first_or_create }.not_to raise_error
+      taxonomy.root.children.unscoped.where(:name => "Some name").first_or_create
     end
   end
 end

data/spec/models/spree/transfer_item_spec.rb

@@ -71,7 +71,7 @@ describe Spree::TransferItem do
 
       context "transfer order is shipped" do
         before do
-          stock_transfer.update_attributes!(shipped_at: Time.now)
+          stock_transfer.update_attributes!(shipped_at: Time.current)
         end
 
         context "variant is not available" do
@@ -153,7 +153,7 @@ describe Spree::TransferItem do
 
       context "stock_transfer is closed" do
         before do
-          stock_transfer.update_attributes!(closed_at: Time.now)
+          stock_transfer.update_attributes!(closed_at: Time.current)
         end
 
         it { is_expected.to eq false }
@@ -173,7 +173,7 @@ describe Spree::TransferItem do
 
     context "stock transfer is finalized" do
       before do
-        stock_transfer.update_attributes(finalized_at: Time.now)
+        stock_transfer.update_attributes(finalized_at: Time.current)
       end
 
       it "adds an error message" do
@@ -206,7 +206,7 @@ describe Spree::TransferItem do
 
     context "stock transfer is finalized" do
       before do
-        stock_transfer.update_attributes(finalized_at: Time.now)
+        stock_transfer.update_attributes(finalized_at: Time.current)
       end
 
       it "does not destroy the transfer item" do

data/spec/models/spree/unit_cancel_spec.rb

@@ -52,7 +52,7 @@ describe Spree::UnitCancel do
       let(:line_item) { create(:line_item) }
 
       it "raises an error" do
-        expect { subject }.to raise_error RuntimeError
+        expect { subject }.to raise_error RuntimeError, "Adjustable does not match line item"
       end
     end
 

data/spec/models/spree/variant_spec.rb

@@ -255,7 +255,7 @@ describe Spree::Variant, :type => :model do
     end
   end
 
-  # Regression test for #2432
+  # Regression test for https://github.com/spree/spree/issues/2432
   describe 'options_text' do
     let!(:variant) { create(:variant, option_values: []) }
     let!(:master) { create(:master_variant) }
@@ -350,7 +350,7 @@ describe Spree::Variant, :type => :model do
 
   end
 
-  # Regression test for #2744
+  # Regression test for https://github.com/spree/spree/issues/2744
   describe "set_position" do
     it "sets variant position after creation" do
       variant = create(:variant)
@@ -463,7 +463,7 @@ describe Spree::Variant, :type => :model do
     it "updates a product" do
       variant.product.update_column(:updated_at, 1.day.ago)
       variant.touch
-      expect(variant.product.reload.updated_at).to be_within(3.seconds).of(Time.now)
+      expect(variant.product.reload.updated_at).to be_within(3.seconds).of(Time.current)
     end
 
     it "clears the in_stock cache key" do

data/spec/models/spree/zone_spec.rb

@@ -137,6 +137,16 @@ describe Spree::Zone, :type => :model do
       @target = create(:zone, name: 'target', zone_members: [])
     end
 
+    it "should contain itself" do
+      expect(@source.contains?(@source)).to be true
+    end
+
+    context "when both source and target have no members" do
+      it "should be false" do
+        expect(@source.contains?(@target)).to be false
+      end
+    end
+
     context "when the target has no members" do
       before { @source.members.create(zoneable: country1) }
 
@@ -155,7 +165,6 @@ describe Spree::Zone, :type => :model do
 
     context "when both zones are the same zone" do
       before do
-        @source.members.create(zoneable: country1)
         @target = @source
       end
 
@@ -302,4 +311,29 @@ describe Spree::Zone, :type => :model do
       end
     end
   end
+
+  context "state and country associations" do
+    let!(:country)  { create(:country) }
+
+    context "has countries associated" do
+      let!(:zone) do
+        create(:zone, countries: [country])
+      end
+
+      it "can access associated countries" do
+        expect(zone.countries).to eq([country])
+      end
+    end
+
+    context "has states associated" do
+      let!(:state)  { create(:state, country: country) }
+      let!(:zone) do
+        create(:zone, states: [state])
+      end
+
+      it "can access associated states" do
+        expect(zone.states).to eq([state])
+      end
+    end
+  end
 end

data/spec/support/concerns/working_factories.rb

@@ -0,0 +1,9 @@
+RSpec.shared_examples_for 'a working factory' do
+  it "builds successfully" do
+    expect(build factory).to be_a(factory_class)
+  end
+
+  it "creates successfully" do
+    expect(create factory).to be_a(factory_class)
+  end
+end

data/vendor/assets/javascripts/jquery-migrate-1.0.0.js

@@ -0,0 +1,498 @@
+/*!
+ * jQuery Migrate - v1.0.0 - 2013-01-14
+ * https://github.com/jquery/jquery-migrate
+ * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
+ */
+(function( jQuery, window, undefined ) {
+"use strict";
+
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to true to prevent console output; migrateWarnings still maintained
+// jQuery.migrateMute = false;
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+  warnedAbout = {};
+  jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg) {
+  if ( !warnedAbout[ msg ] ) {
+    warnedAbout[ msg ] = true;
+    jQuery.migrateWarnings.push( msg );
+    if ( window.console && console.warn && !jQuery.migrateMute ) {
+      console.warn( "JQMIGRATE: " + msg );
+    }
+  }
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+  if ( Object.defineProperty ) {
+    // On ES5 browsers (non-oldIE), warn if the code tries to get prop;
+    // allow property to be overwritten in case some other plugin wants it
+    try {
+      Object.defineProperty( obj, prop, {
+        configurable: true,
+        enumerable: true,
+        get: function() {
+          migrateWarn( msg );
+          return value;
+        },
+        set: function( newValue ) {
+          migrateWarn( msg );
+          value = newValue;
+        }
+      });
+      return;
+    } catch( err ) {
+      // IE8 is a dope about Object.defineProperty, can't warn there
+    }
+  }
+
+  // Non-ES5 (or broken) browser; just set the property
+  jQuery._definePropertyBroken = true;
+  obj[ prop ] = value;
+}
+
+if ( document.compatMode === "BackCompat" ) {
+  // jQuery has never supported or tested Quirks Mode
+  migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var attrFn = {},
+  attr = jQuery.attr,
+  valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
+    function() { return null; },
+  valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
+    function() { return undefined; },
+  rnoType = /^(?:input|button)$/i,
+  rnoAttrNodeType = /^[238]$/,
+  rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+  ruseDefault = /^(?:checked|selected)$/i;
+
+// jQuery.attrFn
+migrateWarnProp( jQuery, "attrFn", attrFn, "jQuery.attrFn is deprecated" );
+
+jQuery.attr = function( elem, name, value, pass ) {
+  var lowerName = name.toLowerCase(),
+    nType = elem && elem.nodeType;
+
+  if ( pass ) {
+    migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
+    if ( elem && !rnoAttrNodeType.test( nType ) && jQuery.isFunction( jQuery.fn[ name ] ) ) {
+      return jQuery( elem )[ name ]( value );
+    }
+  }
+
+  // Warn if user tries to set `type` since it breaks on IE 6/7/8
+  if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) ) {
+    migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
+  }
+
+  // Restore boolHook for boolean property/attribute synchronization
+  if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
+    jQuery.attrHooks[ lowerName ] = {
+      get: function( elem, name ) {
+        // Align boolean attributes with corresponding properties
+        // Fall back to attribute presence where some booleans are not supported
+        var attrNode,
+          property = jQuery.prop( elem, name );
+        return property === true || typeof property !== "boolean" &&
+          ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+
+          name.toLowerCase() :
+          undefined;
+      },
+      set: function( elem, value, name ) {
+        var propName;
+        if ( value === false ) {
+          // Remove boolean attributes when set to false
+          jQuery.removeAttr( elem, name );
+        } else {
+          // value is true since we know at this point it's type boolean and not false
+          // Set boolean attributes to the same name and set the DOM property
+          propName = jQuery.propFix[ name ] || name;
+          if ( propName in elem ) {
+            // Only set the IDL specifically if it already exists on the element
+            elem[ propName ] = true;
+          }
+
+          elem.setAttribute( name, name.toLowerCase() );
+        }
+        return name;
+      }
+    };
+
+    // Warn only for attributes that can remain distinct from their properties post-1.9
+    if ( ruseDefault.test( lowerName ) ) {
+      migrateWarn( "jQuery.fn.attr(" + lowerName + ") may use property instead of attribute" );
+    }
+  }
+
+  return attr.call( jQuery, elem, name, value );
+};
+
+// attrHooks: value
+jQuery.attrHooks.value = {
+  get: function( elem, name ) {
+    var nodeName = ( elem.nodeName || "" ).toLowerCase();
+    if ( nodeName === "button" ) {
+      return valueAttrGet.apply( this, arguments );
+    }
+    if ( nodeName !== "input" && nodeName !== "option" ) {
+      migrateWarn("property-based jQuery.fn.attr('value') is deprecated");
+    }
+    return name in elem ?
+      elem.value :
+      null;
+  },
+  set: function( elem, value ) {
+    var nodeName = ( elem.nodeName || "" ).toLowerCase();
+    if ( nodeName === "button" ) {
+      return valueAttrSet.apply( this, arguments );
+    }
+    if ( nodeName !== "input" && nodeName !== "option" ) {
+      migrateWarn("property-based jQuery.fn.attr('value', val) is deprecated");
+    }
+    // Does not return so that setAttribute is also used
+    elem.value = value;
+  }
+};
+
+
+var matched, browser,
+  oldInit = jQuery.fn.init,
+  // Note this does NOT include the # XSS fix from 1.7!
+  rquickExpr = /^(?:.*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
+
+// $(html) "looks like html" rule change
+jQuery.fn.init = function( selector, context, rootjQuery ) {
+  var match;
+
+  if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
+      (match = rquickExpr.exec( selector )) && match[1] ) {
+    // This is an HTML string according to the "old" rules; is it still?
+    if ( selector.charAt( 0 ) !== "<" ) {
+      migrateWarn("$(html) HTML strings must start with '<' character");
+    }
+    // Now process using loose rules; let pre-1.8 play too
+    if ( context && context.context ) {
+      // jQuery object as context; parseHTML expects a DOM object
+      context = context.context;
+    }
+    if ( jQuery.parseHTML ) {
+      return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
+          context, rootjQuery );
+    }
+  }
+  return oldInit.apply( this, arguments );
+};
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.uaMatch = function( ua ) {
+  ua = ua.toLowerCase();
+
+  var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+    /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+    /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+    /(msie) ([\w.]+)/.exec( ua ) ||
+    ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+    [];
+
+  return {
+    browser: match[ 1 ] || "",
+    version: match[ 2 ] || "0"
+  };
+};
+
+matched = jQuery.uaMatch( navigator.userAgent );
+browser = {};
+
+if ( matched.browser ) {
+  browser[ matched.browser ] = true;
+  browser.version = matched.version;
+}
+
+// Chrome is Webkit, but Webkit is also Safari.
+if ( browser.chrome ) {
+  browser.webkit = true;
+} else if ( browser.webkit ) {
+  browser.safari = true;
+}
+
+jQuery.browser = browser;
+
+// Warn if the code tries to get jQuery.browser
+migrateWarnProp( jQuery, "browser", browser, "jQuery.browser is deprecated" );
+
+jQuery.sub = function() {
+  function jQuerySub( selector, context ) {
+    return new jQuerySub.fn.init( selector, context );
+  }
+  jQuery.extend( true, jQuerySub, this );
+  jQuerySub.superclass = this;
+  jQuerySub.fn = jQuerySub.prototype = this();
+  jQuerySub.fn.constructor = jQuerySub;
+  jQuerySub.sub = this.sub;
+  jQuerySub.fn.init = function init( selector, context ) {
+    if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+      context = jQuerySub( context );
+    }
+
+    return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+  };
+  jQuerySub.fn.init.prototype = jQuerySub.fn;
+  var rootjQuerySub = jQuerySub(document);
+  migrateWarn( "jQuery.sub() is deprecated" );
+  return jQuerySub;
+};
+
+
+var oldFnData = jQuery.fn.data;
+
+jQuery.fn.data = function( name ) {
+  var ret, evt,
+    elem = this[0];
+
+  // Handles 1.7 which has this behavior and 1.8 which doesn't
+  if ( elem && name === "events" && arguments.length === 1 ) {
+    ret = jQuery.data( elem, name );
+    evt = jQuery._data( elem, name );
+    if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
+      migrateWarn("Use of jQuery.fn.data('events') is deprecated");
+      return evt;
+    }
+  }
+  return oldFnData.apply( this, arguments );
+};
+
+
+var rscriptType = /\/(java|ecma)script/i,
+  oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
+  oldFragment = jQuery.buildFragment;
+
+jQuery.fn.andSelf = function() {
+  migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+  return oldSelf.apply( this, arguments );
+};
+
+// Since jQuery.clean is used internally on older versions, we only shim if it's missing
+if ( !jQuery.clean ) {
+  jQuery.clean = function( elems, context, fragment, scripts ) {
+    // Set context per 1.8 logic
+    context = context || document;
+    context = !context.nodeType && context[0] || context;
+    context = context.ownerDocument || context;
+
+    migrateWarn("jQuery.clean() is deprecated");
+
+    var i, elem, handleScript, jsTags,
+      ret = [];
+
+    jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
+
+    // Complex logic lifted directly from jQuery 1.8
+    if ( fragment ) {
+      // Special handling of each script element
+      handleScript = function( elem ) {
+        // Check if we consider it executable
+        if ( !elem.type || rscriptType.test( elem.type ) ) {
+          // Detach the script and store it in the scripts array (if provided) or the fragment
+          // Return truthy to indicate that it has been handled
+          return scripts ?
+            scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+            fragment.appendChild( elem );
+        }
+      };
+
+      for ( i = 0; (elem = ret[i]) != null; i++ ) {
+        // Check if we're done after handling an executable script
+        if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+          // Append to fragment and handle embedded scripts
+          fragment.appendChild( elem );
+          if ( typeof elem.getElementsByTagName !== "undefined" ) {
+            // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+            jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+            // Splice the scripts into ret after their former ancestor and advance our index beyond them
+            ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+            i += jsTags.length;
+          }
+        }
+      }
+    }
+
+    return ret;
+  };
+}
+
+jQuery.buildFragment = function( elems, context, scripts, selection ) {
+  var ret,
+    warning = "jQuery.buildFragment() is deprecated";
+
+  // Set context per 1.8 logic
+  context = context || document;
+  context = !context.nodeType && context[0] || context;
+  context = context.ownerDocument || context;
+
+  try {
+    ret = oldFragment.call( jQuery, elems, context, scripts, selection );
+
+  // jQuery < 1.8 required arrayish context; jQuery 1.9 fails on it
+  } catch( x ) {
+    ret = oldFragment.call( jQuery, elems, context.nodeType ? [ context ] : context[ 0 ], scripts, selection );
+
+    // Success from tweaking context means buildFragment was called by the user
+    migrateWarn( warning );
+  }
+
+  // jQuery < 1.9 returned an object instead of the fragment itself
+  if ( !ret.fragment ) {
+    migrateWarnProp( ret, "fragment", ret, warning );
+    migrateWarnProp( ret, "cacheable", false, warning );
+  }
+
+  return ret;
+};
+
+var eventAdd = jQuery.event.add,
+  eventRemove = jQuery.event.remove,
+  eventTrigger = jQuery.event.trigger,
+  oldToggle = jQuery.fn.toggle,
+  oldLive = jQuery.fn.live,
+  oldDie = jQuery.fn.die,
+  ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
+  rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
+  rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+  hoverHack = function( events ) {
+    if ( typeof( events ) != "string" || jQuery.event.special.hover ) {
+      return events;
+    }
+    if ( rhoverHack.test( events ) ) {
+      migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
+    }
+    return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+  };
+
+// Event props removed in 1.9, put them back if needed; no practical way to warn them
+if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
+  jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
+}
+
+// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
+migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
+
+// Support for 'hover' pseudo-event and ajax event warnings
+jQuery.event.add = function( elem, types, handler, data, selector ){
+  if ( elem !== document && rajaxEvent.test( types ) ) {
+    migrateWarn( "AJAX events should be attached to document: " + types );
+  }
+  eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
+};
+jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
+  eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
+};
+
+jQuery.fn.error = function() {
+  var args = Array.prototype.slice.call( arguments, 0);
+  migrateWarn("jQuery.fn.error() is deprecated");
+  args.splice( 0, 0, "error" );
+  if ( arguments.length ) {
+    return this.bind.apply( this, args );
+  }
+  // error event should not bubble to window, although it does pre-1.7
+  this.triggerHandler.apply( this, args );
+  return this;
+};
+
+jQuery.fn.toggle = function( fn, fn2 ) {
+
+  // Don't mess with animation or css toggles
+  if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
+    return oldToggle.apply( this, arguments );
+  }
+  migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
+
+  // Save reference to arguments for access in closure
+  var args = arguments,
+    guid = fn.guid || jQuery.guid++,
+    i = 0,
+    toggler = function( event ) {
+      // Figure out which function to execute
+      var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+      jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+      // Make sure that clicks stop
+      event.preventDefault();
+
+      // and execute the function
+      return args[ lastToggle ].apply( this, arguments ) || false;
+    };
+
+  // link all the functions, so any of them can unbind this click handler
+  toggler.guid = guid;
+  while ( i < args.length ) {
+    args[ i++ ].guid = guid;
+  }
+
+  return this.click( toggler );
+};
+
+jQuery.fn.live = function( types, data, fn ) {
+  migrateWarn("jQuery.fn.live() is deprecated");
+  if ( oldLive ) {
+    return oldLive.apply( this, arguments );
+  }
+  jQuery( this.context ).on( types, this.selector, data, fn );
+  return this;
+};
+
+jQuery.fn.die = function( types, fn ) {
+  migrateWarn("jQuery.fn.die() is deprecated");
+  if ( oldDie ) {
+    return oldDie.apply( this, arguments );
+  }
+  jQuery( this.context ).off( types, this.selector || "**", fn );
+  return this;
+};
+
+// Turn global events into document-triggered events
+jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
+  if ( !elem & !rajaxEvent.test( event ) ) {
+    migrateWarn( "Global events are undocumented and deprecated" );
+  }
+  return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
+};
+jQuery.each( ajaxEvents.split("|"),
+  function( _, name ) {
+    jQuery.event.special[ name ] = {
+      setup: function() {
+        var elem = this;
+
+        // The document needs no shimming; must be !== for oldIE
+        if ( elem !== document ) {
+          jQuery.event.add( document, name + "." + jQuery.guid, function() {
+            jQuery.event.trigger( name, null, elem, true );
+          });
+          jQuery._data( this, name, jQuery.guid++ );
+        }
+        return false;
+      },
+      teardown: function() {
+        if ( this !== document ) {
+          jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
+        }
+        return false;
+      }
+    };
+  }
+);
+
+
+})( jQuery, window );