#465, fixed rspec error.

saberma · Aug 15, 2012 · 85b97dd · 85b97dd
1 parent 77d7719
commit 85b97dd
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/app/assets/javascripts/backbone/views/products/show/edit.js.coffee b/app/assets/javascripts/backbone/views/products/show/edit.js.coffee
@@ -31,7 +31,7 @@ App.Views.Product.Show.Edit = Backbone.View.extend
         product_type: @$("input[name='product_type']").val(),
         vendor: @$("input[name='vendor']").val(),
         tags_text: @$("input[name='tags_text']").val(),
-        collection_ids: _.map @$("input[name='product[collection_ids][]']:checked"), (input) ->
+        custom_collection_ids: _.map @$("input[name='product[custom_collection_ids][]']:checked"), (input) ->
           input.value
       },
       success: (model, resp) ->

diff --git a/app/assets/javascripts/backbone/views/products/show/show.js.coffee b/app/assets/javascripts/backbone/views/products/show/show.js.coffee
@@ -11,7 +11,7 @@ App.Views.Product.Show.Show = Backbone.View.extend
     attrs = _.clone @model.attributes
     attrs['options'] = @model.options
     attrs['tags'] = StringUtils.to_a attrs.tags_text
-    collections = _.map @model.attributes.collection_ids, (id) ->
+    collections = _.map @model.attributes.custom_collection_ids, (id) ->
       collection =
         id: id
         title: $("#collection_#{id}").next('label').text()

diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb
@@ -14,7 +14,7 @@ class Admin::ProductsController < Admin::AppController
   expose(:product_json) do
     product.to_json({
       include: { options: { methods: [:value, :first, :last], except: [ :created_at, :updated_at ] },photos: {methods: :icon} },
-      methods: [:tags_text, :collection_ids],
+      methods: [:tags_text, :custom_collection_ids],
       except: [ :created_at, :updated_at ]
     })
   end

diff --git a/app/models/product.rb b/app/models/product.rb
@@ -11,7 +11,7 @@ class Product < ActiveRecord::Base
   has_and_belongs_to_many :tags       , order: 'id asc'
   # 标签
   attr_accessor :tags_text,:images
-  attr_accessible :handle, :title, :published, :body_html, :price, :product_type, :vendor, :tags_text, :images, :photos_attributes, :variants_attributes, :options_attributes, :collection_ids
+  attr_accessible :handle, :title, :published, :body_html, :price, :product_type, :vendor, :tags_text, :images, :photos_attributes, :variants_attributes, :options_attributes, :custom_collection_ids
 
   scope :published, where(published: true)
 

diff --git a/app/views/admin/products/_collection.html.haml b/app/views/admin/products/_collection.html.haml
@@ -1,3 +1,3 @@
 %li.product-edit-collection
-  =check_box_tag 'product[collection_ids][]', collection.id, product.custom_collections.include?(collection) || (collection.handle == 'frontpage' and collection.products.size.zero?), id: "collection_#{collection.id}"
+  =check_box_tag 'product[custom_collection_ids][]', collection.id, product.custom_collections.include?(collection) || (collection.handle == 'frontpage' and collection.products.size.zero?), id: "collection_#{collection.id}"
   %label(for="collection_#{collection.id}")=collection.title
diff --git a/spec/controllers/shop/collections_controller_spec.rb b/spec/controllers/shop/collections_controller_spec.rb
@@ -16,7 +16,7 @@
 
   let(:smart_collection_low_price){ Factory(:smart_collection_low_price,handle: 'low_price', shop: shop)}
 
-  let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection] }
+  let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection] }
 
   before :each do
     request.host = "#{shop.primary_domain.host}"
@@ -145,11 +145,11 @@
 
   context '#show_with_tag' do # 结合标签过滤集合商品
 
-    let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection], tags_text: '手机, 游戏机, 带拍照功能' }
+    let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection], tags_text: '手机, 游戏机, 带拍照功能' }
 
-    let(:psp) { Factory :psp, shop: shop, collections: [frontpage_collection], tags_text: '游戏机, 带拍照功能' }
+    let(:psp) { Factory :psp, shop: shop, custom_collections: [frontpage_collection], tags_text: '游戏机, 带拍照功能' }
 
-    let(:leika) { Factory :leika, shop: shop, collections: [frontpage_collection], tags_text: '相机, 带拍照功能' }
+    let(:leika) { Factory :leika, shop: shop, custom_collections: [frontpage_collection], tags_text: '相机, 带拍照功能' }
 
     before do
       [iphone4, psp]

diff --git a/spec/controllers/shop/products_controller_spec.rb b/spec/controllers/shop/products_controller_spec.rb
@@ -14,7 +14,7 @@
 
   let(:frontpage_collection) { shop.custom_collections.where(handle: 'frontpage').first }
 
-  let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection] }
+  let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection] }
 
   before :each do
     request.host = "#{shop.primary_domain.host}"

diff --git a/spec/liquids/collections_drop_spec.rb b/spec/liquids/collections_drop_spec.rb
@@ -9,9 +9,9 @@
 
   let(:smart_collection_low_price){ Factory(:smart_collection_low_price, shop: shop)}
 
-  let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection] }
+  let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection] }
 
-  let(:psp) { Factory :psp, shop: shop, collections: [frontpage_collection] }
+  let(:psp) { Factory :psp, shop: shop, custom_collections: [frontpage_collection] }
 
   let(:collections_drop) { CollectionsDrop.new(shop) }
 

diff --git a/spec/liquids/paginate_filter_spec.rb b/spec/liquids/paginate_filter_spec.rb
@@ -9,7 +9,7 @@
 
   let(:collection_drop) { CollectionDrop.new(collection) }
 
-  let(:iphone4) { Factory :iphone4, shop: shop, collections: [collection] }
+  let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [collection] }
 
   context '#default_pagination' do
 

diff --git a/spec/liquids/tag_filter_spec.rb b/spec/liquids/tag_filter_spec.rb
@@ -58,7 +58,7 @@
 
       let(:collection) { shop.custom_collections.where(handle: 'frontpage').first }
 
-      let(:iphone4) { Factory :iphone4, shop: shop, collections: [collection], tags_text: '智能 手机 待机时间长'  }
+      let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [collection], tags_text: '智能 手机 待机时间长'  }
 
       it "should get link to tag url" do
         variant = "{{ tag | link_to_tag: tag }}"

diff --git a/spec/models/custom_collection_spec.rb b/spec/models/custom_collection_spec.rb
@@ -36,7 +36,7 @@
 
     let(:frontpage_collection) { shop.custom_collections.where(handle: 'frontpage').first }
 
-    let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection] }
+    let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection] }
 
     context 'create' do
 

diff --git a/spec/requests/shop/shops_searches_spec.rb b/spec/requests/shop/shops_searches_spec.rb
@@ -8,7 +8,7 @@
 
   let(:frontpage_collection) { shop.custom_collections.where(handle: 'frontpage').first }
 
-  let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection] }
+  let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection] }
 
   # 查询(需要启动全文检索服务) RAILS_ENV=test bundle exec rake sunspot:solr:run
   describe "GET /search", searchable: true do

diff --git a/spec/requests/shop/shops_spec.rb b/spec/requests/shop/shops_spec.rb
@@ -18,7 +18,7 @@
 
   let(:frontpage_collection) { shop.custom_collections.where(handle: 'frontpage').first }
 
-  let(:iphone4) { Factory :iphone4, shop: shop, collections: [frontpage_collection] }
+  let(:iphone4) { Factory :iphone4, shop: shop, custom_collections: [frontpage_collection] }
 
   let(:payment) { Factory :payment, shop: shop }