Merge pull request #4 from deseretbook/fix_order_by_option_value

DES-192: Changes `order_by_option_values` to return all variants ordered.

app/models/spree/variant_decorator.rb

@@ -1,14 +1,15 @@
 Spree::Variant.class_eval do
   # Sorts by option value position and other criteria after variant position.
   scope :order_by_option_value, ->{
-    joins(:option_values).unscope(:order).order(
+    left_outer_joins(:option_values)
+    .unscope(:order).order(
       position: :asc
     ).order(
       'spree_option_values.position ASC'
     ).order(
       is_master: :desc,
       id: :asc
-    ).distinct
+    )
   }
 
   # Returns this variant's option value for its product's first option type.

spec/controllers/spree/products_controller_spec.rb

@@ -11,13 +11,13 @@
   end
 
   describe '#show' do
-    it 'returns only variants with option values' do
+    it 'returns all variants even if they dont have option values' do
       product = create(:product_with_option_types)
       create(:base_variant, product: product) # this has option values
       create(:base_variant, product: product, option_values: [])
 
       get :show, params: { id: product.to_param }
-      expect(assigns['variants'].count).to eq(1)
+      expect(assigns['variants'].count).to eq(3)
     end
   end
 end