From ecddad9324c01b5d9e0fdd40607fe6a6149adf22 Mon Sep 17 00:00:00 2001 From: Jeff Dutil Date: Mon, 29 Sep 2014 14:21:12 -0400 Subject: [PATCH] Dont override channel and don't add query strings to image urls. --- app/serializers/spree/wombat/image_serializer.rb | 2 +- app/serializers/spree/wombat/order_serializer.rb | 2 +- app/serializers/spree/wombat/shipment_serializer.rb | 2 +- .../serializers/spree/wombat/order_serializer_spec.rb | 11 +++++++++-- .../spree/wombat/shipment_serializer_spec.rb | 11 +++++++++-- .../spree/wombat/variant_serializer_spec.rb | 2 +- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/serializers/spree/wombat/image_serializer.rb b/app/serializers/spree/wombat/image_serializer.rb index f535ac1..5e143c1 100644 --- a/app/serializers/spree/wombat/image_serializer.rb +++ b/app/serializers/spree/wombat/image_serializer.rb @@ -6,7 +6,7 @@ class ImageSerializer < ActiveModel::Serializer attributes :url, :position, :title, :type, :dimensions def url - add_host_prefix(object.attachment.url(:original)) + add_host_prefix(object.attachment.url(:original)).gsub(/\?.*/, '') end def title diff --git a/app/serializers/spree/wombat/order_serializer.rb b/app/serializers/spree/wombat/order_serializer.rb index 2e923d5..50438e9 100644 --- a/app/serializers/spree/wombat/order_serializer.rb +++ b/app/serializers/spree/wombat/order_serializer.rb @@ -26,7 +26,7 @@ def status end def channel - 'spree' + object.channel || 'spree' end def updated_at diff --git a/app/serializers/spree/wombat/shipment_serializer.rb b/app/serializers/spree/wombat/shipment_serializer.rb index de871d9..06a1d2b 100644 --- a/app/serializers/spree/wombat/shipment_serializer.rb +++ b/app/serializers/spree/wombat/shipment_serializer.rb @@ -23,7 +23,7 @@ def email end def channel - 'spree' + object.order.channel || 'spree' end def cost diff --git a/spec/serializers/spree/wombat/order_serializer_spec.rb b/spec/serializers/spree/wombat/order_serializer_spec.rb index 44379ed..4ade6b7 100644 --- a/spec/serializers/spree/wombat/order_serializer_spec.rb +++ b/spec/serializers/spree/wombat/order_serializer_spec.rb @@ -20,8 +20,15 @@ module Wombat expect(serialized_order["status"]).to eql order.state end - it "sets the channel to spree" do - expect(serialized_order["channel"]).to eql "spree" + context '#channel' do + it "sets the channel to spree if unset" do + expect(serialized_order["channel"]).to eql "spree" + end + + it "sets the channel to existing value other than spree" do + order.update_column :channel, 'wombat' + expect(serialized_order["channel"]).to eql "wombat" + end end it "set's the placed_on to completed_at date in ISO format" do diff --git a/spec/serializers/spree/wombat/shipment_serializer_spec.rb b/spec/serializers/spree/wombat/shipment_serializer_spec.rb index 951acf7..c74bc27 100644 --- a/spec/serializers/spree/wombat/shipment_serializer_spec.rb +++ b/spec/serializers/spree/wombat/shipment_serializer_spec.rb @@ -27,8 +27,15 @@ module Wombat expect(serialized_shipment["status"]).to eql shipment.state end - it "sets the channel to spree" do - expect(serialized_shipment["channel"]).to eql "spree" + context '#channel' do + it "sets the channel to spree if unset" do + expect(serialized_shipment["channel"]).to eql "spree" + end + + it "sets the channel to existing value other than spree" do + shipment.order.update_column :channel, 'wombat' + expect(serialized_shipment["channel"]).to eql "wombat" + end end it "serializes the stock_location.name as stock_location" do diff --git a/spec/serializers/spree/wombat/variant_serializer_spec.rb b/spec/serializers/spree/wombat/variant_serializer_spec.rb index ffa6245..b73a451 100644 --- a/spec/serializers/spree/wombat/variant_serializer_spec.rb +++ b/spec/serializers/spree/wombat/variant_serializer_spec.rb @@ -61,7 +61,7 @@ module Wombat expect(serialized_variant["images"].count).to be 3 dimension_hash = {"height" => 490, "width" => 489} 3.times.each_with_index do |i| - expect(serialized_variant["images"][i]["url"]).to match /http:\/\/myapp.dev\/spree\/products\/\d*\/original\/thinking-cat.jpg\?\d*/ + expect(serialized_variant["images"][i]["url"]).to match /http:\/\/myapp.dev\/spree\/products\/\d*\/original\/thinking-cat.jpg\z/ expect(serialized_variant["images"][i]["position"]).to eql i expect(serialized_variant["images"][i]["title"]).to eql "variant image #{i}" expect(serialized_variant["images"][i]["type"]).to eql "original"