radiant-shop-extension 0.10.0 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (272) hide show
  1. data/README.md +5 -1
  2. data/VERSION +1 -1
  3. data/app/controllers/admin/shop/categories_controller.rb +32 -65
  4. data/app/controllers/admin/shop/customers_controller.rb +8 -7
  5. data/app/controllers/admin/shop/orders_controller.rb +37 -159
  6. data/app/controllers/admin/shop/packages/packings_controller.rb +90 -0
  7. data/app/controllers/admin/shop/packages_controller.rb +65 -0
  8. data/app/controllers/admin/shop/products/images_controller.rb +5 -8
  9. data/app/controllers/admin/shop/products/variant_templates_controller.rb +27 -0
  10. data/app/controllers/admin/shop/products/variants_controller.rb +60 -0
  11. data/app/controllers/admin/shop/products_controller.rb +67 -64
  12. data/app/controllers/admin/shop/variants_controller.rb +49 -0
  13. data/app/helpers/shop_helper.rb +5 -0
  14. data/app/models/form_address.rb +144 -0
  15. data/app/models/form_checkout.rb +200 -307
  16. data/app/models/form_line_item.rb +60 -0
  17. data/app/models/shop_address.rb +2 -2
  18. data/app/models/shop_category.rb +48 -51
  19. data/app/models/shop_customer.rb +25 -5
  20. data/app/models/shop_group.rb +15 -0
  21. data/app/models/shop_grouping.rb +6 -0
  22. data/app/models/shop_line_item.rb +7 -6
  23. data/app/models/shop_order.rb +44 -16
  24. data/app/models/shop_package.rb +74 -0
  25. data/app/models/shop_packing.rb +22 -0
  26. data/app/models/shop_page.rb +7 -0
  27. data/app/models/shop_payment.rb +5 -1
  28. data/app/models/shop_product.rb +86 -48
  29. data/app/models/shop_product_attachment.rb +5 -2
  30. data/app/models/shop_product_variant.rb +31 -0
  31. data/app/models/shop_variant.rb +25 -0
  32. data/app/views/admin/shop/categories/edit.html.haml +9 -10
  33. data/app/views/admin/shop/categories/edit/_foot.html.haml +9 -0
  34. data/app/views/admin/shop/categories/edit/_form.html.haml +14 -0
  35. data/app/views/admin/shop/categories/edit/_head.html.haml +4 -2
  36. data/app/views/admin/shop/categories/edit/_inputs.html.haml +2 -0
  37. data/app/views/admin/shop/categories/edit/_meta.html.haml +8 -7
  38. data/app/views/admin/shop/categories/edit/_parts.html.haml +9 -0
  39. data/app/views/admin/shop/categories/edit/_popups.html.haml +4 -0
  40. data/app/views/admin/shop/categories/edit/inputs/_name.html.haml +4 -0
  41. data/app/views/admin/shop/categories/edit/meta/_handle.html.haml +6 -5
  42. data/app/views/admin/shop/categories/edit/meta/_layouts.html.haml +6 -5
  43. data/app/views/admin/shop/categories/edit/meta/_page.html.haml +3 -0
  44. data/app/views/admin/shop/categories/edit/parts/_description.html.haml +4 -1
  45. data/app/views/admin/shop/categories/index/_category.html.haml +11 -10
  46. data/app/views/admin/shop/categories/new.html.haml +10 -9
  47. data/app/views/admin/shop/customers/edit.html.haml +8 -10
  48. data/app/views/admin/shop/customers/edit/_foot.html.haml +9 -0
  49. data/app/views/admin/shop/customers/edit/_form.html.haml +13 -0
  50. data/app/views/admin/shop/customers/edit/_head.html.haml +4 -2
  51. data/app/views/admin/shop/customers/edit/_inputs.html.haml +2 -0
  52. data/app/views/admin/shop/customers/edit/_parts.html.haml +9 -4
  53. data/app/views/admin/shop/customers/edit/inputs/_email.html.haml +3 -0
  54. data/app/views/admin/shop/customers/edit/inputs/_name.html.haml +3 -0
  55. data/app/views/admin/shop/customers/edit/parts/_orders.html.haml +10 -6
  56. data/app/views/admin/shop/customers/index.html.haml +4 -1
  57. data/app/views/admin/shop/customers/index/_customer.html.haml +3 -3
  58. data/app/views/admin/shop/customers/index/_foot.html.haml +4 -0
  59. data/app/views/admin/shop/customers/index/_head.html.haml +4 -0
  60. data/app/views/admin/shop/customers/new.html.haml +9 -9
  61. data/app/views/admin/shop/orders/edit.html.haml +11 -0
  62. data/app/views/admin/shop/orders/edit/_foot.html.haml +9 -0
  63. data/app/views/admin/shop/orders/edit/_form.html.haml +13 -0
  64. data/app/views/admin/shop/orders/edit/_head.html.haml +4 -0
  65. data/app/views/admin/shop/orders/edit/_inputs.html.haml +2 -0
  66. data/app/views/admin/shop/orders/edit/_meta.html.haml +8 -0
  67. data/app/views/admin/shop/orders/edit/_parts.html.haml +9 -0
  68. data/app/views/admin/shop/orders/edit/_popups.html.haml +4 -0
  69. data/app/views/admin/shop/orders/edit/parts/_address.html.haml +7 -0
  70. data/app/views/admin/shop/orders/edit/parts/_addresses.html.haml +9 -0
  71. data/app/views/admin/shop/orders/edit/parts/_customer.html.haml +3 -0
  72. data/app/views/admin/shop/orders/edit/parts/_items.html.haml +8 -0
  73. data/app/views/admin/shop/orders/index.html.haml +10 -30
  74. data/app/views/admin/shop/orders/index/_foot.html.haml +3 -0
  75. data/app/views/admin/shop/orders/index/_head.html.haml +4 -0
  76. data/app/views/admin/shop/orders/index/_order.html.haml +13 -0
  77. data/app/views/admin/shop/orders/index/buttons/_all.html.haml +1 -0
  78. data/app/views/admin/shop/orders/index/buttons/_new.html.haml +1 -0
  79. data/app/views/admin/shop/orders/index/buttons/_paid.html.haml +1 -0
  80. data/app/views/admin/shop/orders/index/buttons/_shipped.html.haml +1 -0
  81. data/app/views/admin/shop/packages/edit.html.haml +11 -0
  82. data/app/views/admin/shop/packages/edit/_foot.html.haml +17 -0
  83. data/app/views/admin/shop/packages/edit/_form.html.haml +15 -0
  84. data/app/views/admin/shop/packages/edit/_head.html.haml +4 -0
  85. data/app/views/admin/shop/packages/edit/_inputs.html.haml +2 -0
  86. data/app/views/admin/shop/packages/edit/_meta.html.haml +8 -0
  87. data/app/views/admin/shop/packages/edit/_parts.html.haml +9 -0
  88. data/app/views/admin/shop/packages/edit/_popups.html.haml +4 -0
  89. data/app/views/admin/shop/packages/edit/buttons/_browse_products.html.haml +1 -0
  90. data/app/views/admin/shop/packages/edit/inputs/_name.html.haml +3 -0
  91. data/app/views/admin/shop/packages/edit/inputs/_price.html.haml +3 -0
  92. data/app/views/admin/shop/packages/edit/meta/_sku.html.haml +5 -0
  93. data/app/views/admin/shop/packages/edit/parts/_description.html.haml +1 -0
  94. data/app/views/admin/shop/packages/edit/parts/_products.html.haml +3 -0
  95. data/app/views/admin/shop/packages/edit/popups/_browse_products.html.haml +7 -0
  96. data/app/views/admin/shop/packages/edit/shared/_product.html.haml +8 -0
  97. data/app/views/admin/shop/packages/index.html.haml +13 -0
  98. data/app/views/admin/shop/packages/index/_foot.html.haml +7 -0
  99. data/app/views/admin/shop/packages/index/_head.html.haml +4 -0
  100. data/app/views/admin/shop/packages/index/_package.html.haml +9 -0
  101. data/app/views/admin/shop/packages/new.html.haml +11 -0
  102. data/app/views/admin/shop/packages/remove.html.haml +12 -0
  103. data/app/views/admin/shop/products/edit.html.haml +9 -12
  104. data/app/views/admin/shop/products/edit/_foot.html.haml +19 -0
  105. data/app/views/admin/shop/products/edit/_form.html.haml +15 -0
  106. data/app/views/admin/shop/products/edit/_head.html.haml +4 -2
  107. data/app/views/admin/shop/products/edit/_inputs.html.haml +2 -0
  108. data/app/views/admin/shop/products/edit/_meta.html.haml +8 -8
  109. data/app/views/admin/shop/products/edit/_parts.html.haml +9 -0
  110. data/app/views/admin/shop/products/edit/_popups.html.haml +4 -0
  111. data/app/views/admin/shop/products/edit/buttons/_browse_images.html.haml +1 -1
  112. data/app/views/admin/shop/products/edit/buttons/_browse_templates.html.haml +1 -0
  113. data/app/views/admin/shop/products/edit/buttons/_new_image.html.haml +1 -1
  114. data/app/views/admin/shop/products/edit/buttons/_new_variant.html.haml +1 -0
  115. data/app/views/admin/shop/products/edit/inputs/_name.html.haml +4 -0
  116. data/app/views/admin/shop/products/edit/inputs/_price.html.haml +3 -0
  117. data/app/views/admin/shop/products/edit/meta/_category.html.haml +6 -5
  118. data/app/views/admin/shop/products/edit/meta/_page.html.haml +2 -0
  119. data/app/views/admin/shop/products/edit/meta/_sku.html.haml +6 -5
  120. data/app/views/admin/shop/products/edit/parts/_customers.html.haml +5 -0
  121. data/app/views/admin/shop/products/edit/parts/_description.html.haml +4 -1
  122. data/app/views/admin/shop/products/edit/parts/_images.html.haml +1 -1
  123. data/app/views/admin/shop/products/edit/parts/_variants.html.haml +3 -0
  124. data/app/views/admin/shop/products/edit/popups/_browse_images.html.haml +1 -1
  125. data/app/views/admin/shop/products/edit/popups/_browse_templates.html.haml +6 -0
  126. data/app/views/admin/shop/products/edit/popups/_new_image.html.haml +4 -4
  127. data/app/views/admin/shop/products/edit/popups/_new_variant.html.haml +16 -0
  128. data/app/views/admin/shop/products/edit/{_image.html.haml → shared/_image.html.haml} +0 -0
  129. data/app/views/admin/shop/products/edit/shared/_template.html.haml +6 -0
  130. data/app/views/admin/shop/products/edit/shared/_variant.html.haml +10 -0
  131. data/app/views/admin/shop/products/index.html.haml +6 -3
  132. data/app/views/admin/shop/products/index/_foot.html.haml +10 -0
  133. data/app/views/admin/shop/products/index/_head.html.haml +4 -0
  134. data/app/views/admin/shop/products/index/_product.html.haml +18 -10
  135. data/app/views/admin/shop/products/index/buttons/_discounts.html.haml +1 -0
  136. data/app/views/admin/shop/products/index/buttons/_packages.html.haml +1 -0
  137. data/app/views/admin/shop/products/index/buttons/_variants.html.haml +1 -0
  138. data/app/views/admin/shop/products/new.html.haml +10 -9
  139. data/app/views/admin/shop/variants/edit.html.haml +11 -0
  140. data/app/views/admin/shop/variants/edit/_foot.html.haml +9 -0
  141. data/app/views/admin/shop/variants/edit/_form.html.haml +13 -0
  142. data/app/views/admin/shop/variants/edit/_head.html.haml +4 -0
  143. data/app/views/admin/shop/variants/edit/_inputs.html.haml +2 -0
  144. data/app/views/admin/shop/variants/edit/_meta.html.haml +8 -0
  145. data/app/views/admin/shop/variants/edit/_parts.html.haml +9 -0
  146. data/app/views/admin/shop/variants/edit/_popups.html.haml +4 -0
  147. data/app/views/admin/shop/variants/edit/inputs/_name.html.haml +3 -0
  148. data/app/views/admin/shop/variants/edit/inputs/_options.html.haml +3 -0
  149. data/app/views/admin/shop/variants/index.html.haml +13 -0
  150. data/app/views/admin/shop/variants/index/_foot.html.haml +4 -0
  151. data/app/views/admin/shop/variants/index/_head.html.haml +4 -0
  152. data/app/views/admin/shop/variants/index/_variant.html.haml +9 -0
  153. data/app/views/admin/shop/variants/new.html.haml +11 -0
  154. data/app/views/admin/shop/variants/remove.html.haml +12 -0
  155. data/config/locales/en.yml +8 -1
  156. data/config/routes.rb +11 -22
  157. data/db/migrate/20100929011106_fix_relationship_foreign_keys.rb +101 -0
  158. data/db/migrate/20100929011607_drop_shop_addressables.rb +25 -0
  159. data/db/migrate/20100929030510_create_shop_groups.rb +19 -0
  160. data/db/migrate/20100929080301_shop_groups_change_add_description.rb +11 -0
  161. data/db/migrate/20100929081200_create_variants.rb +20 -0
  162. data/db/migrate/20100929143531_change_variants_add_updated_by.rb +25 -0
  163. data/db/migrate/20100929145641_change_created_by_to_id.rb +75 -0
  164. data/db/migrate/20100929235221_change_category_add_variant_id.rb +9 -0
  165. data/db/migrate/20100930235221_create_packages.rb +31 -0
  166. data/db/migrate/20101005231713_create_page_ids.rb +11 -0
  167. data/db/migrate/20101006051214_create_pages_for_products_and_categories.rb +73 -0
  168. data/db/migrate/20101007111845_add_default_position_to_attachment.rb +9 -0
  169. data/lib/shop/controllers/application_controller.rb +1 -1
  170. data/lib/shop/interface/categories.rb +29 -0
  171. data/lib/shop/interface/customers.rb +15 -15
  172. data/lib/shop/interface/orders.rb +34 -0
  173. data/lib/shop/interface/packages.rb +34 -0
  174. data/lib/shop/interface/products.rb +18 -31
  175. data/lib/shop/interface/variants.rb +34 -0
  176. data/lib/shop/models/form_extension.rb +23 -0
  177. data/lib/shop/models/page.rb +3 -2
  178. data/lib/shop/tags/address.rb +3 -3
  179. data/lib/shop/tags/cart.rb +12 -16
  180. data/lib/shop/tags/category.rb +4 -6
  181. data/lib/shop/tags/helpers.rb +131 -30
  182. data/lib/shop/tags/item.rb +16 -33
  183. data/lib/shop/tags/package.rb +95 -0
  184. data/lib/shop/tags/product.rb +11 -16
  185. data/lib/shop/tags/product_variant.rb +52 -0
  186. data/mockups/discounts/new-edit.bmml +492 -0
  187. data/public/javascripts/admin/extensions/shop/edit.js +20 -0
  188. data/public/javascripts/admin/extensions/shop/packages/edit.js +109 -0
  189. data/public/javascripts/admin/extensions/shop/products/edit.js +64 -65
  190. data/public/javascripts/admin/extensions/shop/products/index.js +31 -36
  191. data/public/stylesheets/sass/admin/extensions/shop/edit.sass +58 -11
  192. data/public/stylesheets/sass/admin/extensions/shop/index.sass +104 -53
  193. data/public/stylesheets/sass/admin/extensions/shop/packages/edit.sass +162 -0
  194. data/public/stylesheets/sass/admin/extensions/shop/products/edit.sass +115 -36
  195. data/public/stylesheets/sass/admin/extensions/shop/products/index.sass +12 -20
  196. data/radiant-shop-extension.gemspec +182 -38
  197. data/shop_extension.rb +29 -25
  198. data/spec/controllers/admin/shop/categories_controller_spec.rb +76 -191
  199. data/spec/controllers/admin/shop/customers_controller_spec.rb +67 -0
  200. data/spec/controllers/admin/shop/orders_controller_spec.rb +85 -0
  201. data/spec/controllers/admin/shop/packages/packings_controller_spec.rb +188 -0
  202. data/spec/controllers/admin/shop/packages_controller_spec.rb +32 -0
  203. data/spec/controllers/admin/shop/products/images_controller_spec.rb +10 -15
  204. data/spec/controllers/admin/shop/products/variant_templates_controller_spec.rb +53 -0
  205. data/spec/controllers/admin/shop/products/variants_controller_spec.rb +116 -0
  206. data/spec/controllers/admin/shop/products_controller_spec.rb +80 -148
  207. data/spec/controllers/admin/shop/variants_controller_spec.rb +67 -0
  208. data/spec/datasets/forms.rb +23 -8
  209. data/spec/datasets/shop_addresses.rb +1 -4
  210. data/spec/datasets/shop_categories.rb +25 -4
  211. data/spec/datasets/shop_groups.rb +15 -0
  212. data/spec/datasets/shop_line_items.rb +4 -3
  213. data/spec/datasets/shop_orders.rb +6 -15
  214. data/spec/datasets/shop_packages.rb +25 -0
  215. data/spec/datasets/shop_payments.rb +12 -0
  216. data/spec/datasets/{images.rb → shop_product_attachments.rb} +9 -1
  217. data/spec/datasets/shop_product_variants.rb +22 -0
  218. data/spec/datasets/shop_products.rb +28 -18
  219. data/spec/datasets/shop_variants.rb +17 -0
  220. data/spec/lib/shop/models/image_spec.rb +4 -4
  221. data/spec/lib/shop/tags/address_spec.rb +3 -3
  222. data/spec/lib/shop/tags/cart_spec.rb +32 -43
  223. data/spec/lib/shop/tags/category_spec.rb +58 -93
  224. data/spec/lib/shop/tags/helpers_spec.rb +162 -69
  225. data/spec/lib/shop/tags/item_spec.rb +116 -158
  226. data/spec/lib/shop/tags/package_spec.rb +342 -0
  227. data/spec/lib/shop/tags/product_spec.rb +29 -26
  228. data/spec/lib/shop/tags/product_variant_spec.rb +175 -0
  229. data/spec/models/form_address_spec.rb +166 -0
  230. data/spec/models/form_checkout_spec.rb +27 -157
  231. data/spec/models/shop_address_spec.rb +81 -0
  232. data/spec/models/shop_category_spec.rb +114 -31
  233. data/spec/models/shop_customer_spec.rb +105 -0
  234. data/spec/models/shop_group_spec.rb +38 -0
  235. data/spec/models/shop_line_item_spec.rb +5 -5
  236. data/spec/models/shop_order_spec.rb +89 -83
  237. data/spec/models/shop_package_spec.rb +117 -0
  238. data/spec/models/shop_packing_spec.rb +67 -0
  239. data/spec/models/shop_payment_spec.rb +19 -0
  240. data/spec/models/shop_product_attachment_spec.rb +4 -3
  241. data/spec/models/shop_product_spec.rb +171 -92
  242. data/spec/models/shop_product_variant_spec.rb +92 -0
  243. data/spec/models/shop_variant_spec.rb +47 -0
  244. metadata +183 -39
  245. data/app/controllers/shop/categories_controller.rb +0 -45
  246. data/app/controllers/shop/line_items_controller.rb +0 -165
  247. data/app/controllers/shop/orders_controller.rb +0 -16
  248. data/app/controllers/shop/products_controller.rb +0 -48
  249. data/app/models/shop_addressable.rb +0 -11
  250. data/app/views/admin/shop/categories/edit/_fields.html.haml +0 -28
  251. data/app/views/admin/shop/categories/edit/_part.html.haml +0 -3
  252. data/app/views/admin/shop/categories/edit/_popup.html.haml +0 -3
  253. data/app/views/admin/shop/customers/edit/_fields.html.haml +0 -33
  254. data/app/views/admin/shop/customers/index/_bottom.html.haml +0 -4
  255. data/app/views/admin/shop/products/edit/_fields.html.haml +0 -38
  256. data/app/views/admin/shop/products/edit/_part.html.haml +0 -3
  257. data/app/views/admin/shop/products/edit/_popup.html.haml +0 -3
  258. data/app/views/admin/shop/products/index/_bottom.html.haml +0 -5
  259. data/spec/controllers/shop/categories_controller_spec.rb +0 -42
  260. data/spec/controllers/shop/line_items_controller_spec.rb +0 -256
  261. data/spec/controllers/shop/orders_controller_specs.rb +0 -37
  262. data/spec/controllers/shop/products_controller_spec.rb +0 -51
  263. data/vendor/plugins/json_fields/.gitignore +0 -3
  264. data/vendor/plugins/json_fields/MIT-LICENSE +0 -20
  265. data/vendor/plugins/json_fields/README.rdoc +0 -65
  266. data/vendor/plugins/json_fields/Rakefile +0 -55
  267. data/vendor/plugins/json_fields/init.rb +0 -2
  268. data/vendor/plugins/json_fields/lib/json_fields.rb +0 -99
  269. data/vendor/plugins/json_fields/spec/lib/json_fields_spec.rb +0 -124
  270. data/vendor/plugins/json_fields/spec/spec.opts +0 -6
  271. data/vendor/plugins/json_fields/spec/spec_helper.rb +0 -29
  272. data/vendor/plugins/json_fields/spec/test_models.rb +0 -12
@@ -8,165 +8,29 @@ describe FormCheckout do
8
8
  mock_page_with_request_and_data
9
9
  end
10
10
  describe '#create' do
11
- context 'addresses' do
12
-
13
- context 'sending ids with user logged in' do
11
+ context 'gateway' do
12
+ context 'order has no billing' do
14
13
  before :each do
15
- login_as :customer # Will have existing addresses due to several_items
16
- @order = shop_orders(:one_item)
14
+ login_as :customer
15
+ @order = shop_orders(:empty)
17
16
  mock_valid_form_checkout_request
18
17
  end
19
18
 
20
- context 'both billing and shipping' do
21
- it 'should assign that address to the order billing and shipping' do
22
- @data[:billing] = { :id => shop_orders(:several_items).billing.id }
23
- @data[:shipping] = { :id => shop_orders(:several_items).shipping.id }
24
-
25
- @checkout = FormCheckout.new(@form, @page)
26
- result = @checkout.create
27
-
28
- shop_orders(:one_item).billing.should === shop_addresses(:billing)
29
- shop_orders(:one_item).shipping.should === shop_addresses(:shipping)
30
-
31
- result[:billing].should === true
32
- result[:shipping].should === true
33
- end
34
- end
35
-
36
- context 'just billing' do
37
- it 'should assign shipping to be billing' do
38
- # Set the order to have no shipping address
39
- @data[:shipping] = {}
40
-
41
- @checkout = FormCheckout.new(@form, @page)
42
- result = @checkout.create
43
-
44
- shop_orders(:one_item).billing.should === shop_addresses(:billing)
45
- shop_orders(:one_item).shipping.should === shop_addresses(:billing)
46
-
47
- result[:billing].should === true
48
- result[:shipping].should === true
49
- end
50
- end
51
- end
52
-
53
- context 'sending ids without customer logged in' do
54
- before :each do
55
- @order = shop_orders(:one_item)
56
- mock_valid_form_checkout_request
57
- end
58
- context 'both billing and shipping' do
59
- it 'it should not assign those addresses' do
60
- @checkout = FormCheckout.new(@form, @page)
61
- result = @checkout.create
62
-
63
- shop_orders(:one_item).billing.should be_nil
64
- shop_orders(:one_item).shipping.should be_nil
65
-
66
- result[:billing].should === false
67
- result[:shipping].should === false
68
- end
69
- end
70
- end
71
-
72
- context 'sending ids as a bad customer' do
73
- before :each do
74
- login_as :bad_customer
75
- @order = shop_orders(:one_item)
76
- mock_valid_form_checkout_request
77
- end
78
- it 'should not assign those addresses' do
19
+ it 'should return the standard response' do
79
20
  @checkout = FormCheckout.new(@form, @page)
80
21
  result = @checkout.create
81
-
82
- shop_orders(:one_item).billing.should be_nil
83
- shop_orders(:one_item).shipping.should be_nil
84
-
85
- result[:billing].should === false
86
- result[:shipping].should === false
22
+
23
+ result[:gateway].should be_nil
24
+ result[:payment].should be_nil
25
+ result[:card].should be_nil
26
+ result[:message].should be_nil
87
27
  end
88
28
  end
89
29
 
90
- context 'updating existing addresses' do
30
+ context 'configured correctly' do
91
31
  before :each do
92
32
  login_as :customer
93
33
  @order = shop_orders(:several_items)
94
- mock_valid_form_checkout_request
95
- end
96
- it 'should keep them assigned and update them' do
97
- @data[:billing] = { :name => 'new billing' }
98
- @data[:shipping] = { :name => 'new shipping' }
99
-
100
- @checkout = FormCheckout.new(@form, @page)
101
- result = @checkout.create
102
-
103
- shop_addresses(:billing).name.should === 'new billing'
104
- shop_addresses(:shipping).name.should === 'new shipping'
105
-
106
- result[:billing].should === true
107
- result[:shipping].should === true
108
- end
109
- end
110
-
111
- context 'new addresses' do
112
- before :each do
113
- login_as :customer
114
- @order = shop_orders(:one_item)
115
- mock_valid_form_checkout_request
116
-
117
- @data[:billing][:id] = nil
118
- @data[:shipping][:id] = nil
119
- end
120
-
121
- context 'both billing and shipping sent' do
122
- it 'should create new addresses' do
123
- @checkout = FormCheckout.new(@form, @page)
124
- result = @checkout.create
125
-
126
- shop_orders(:one_item).billing.name.should === @data[:billing][:name]
127
- shop_orders(:one_item).shipping.name.should === @data[:shipping][:name]
128
-
129
- result[:billing].should === true
130
- result[:shipping].should === true
131
- end
132
- end
133
-
134
- context 'only billing sent' do
135
- it 'should copy billing to shipping' do
136
- @data[:shipping] = {}
137
-
138
- @checkout = FormCheckout.new(@form, @page)
139
- result = @checkout.create
140
-
141
- shop_orders(:one_item).billing.name.should === @data[:billing][:name]
142
- shop_orders(:one_item).shipping.name.should === @data[:billing][:name]
143
-
144
- result[:billing].should === true
145
- result[:shipping].should === true
146
- end
147
- end
148
-
149
- context 'billing sent with same shipping' do
150
- it 'should copy billing to shipping' do
151
- @data[:shipping] = @data[:billing]
152
-
153
- @checkout = FormCheckout.new(@form, @page)
154
- result = @checkout.create
155
-
156
- shop_orders(:one_item).shipping.should === shop_orders(:one_item).billing
157
-
158
- result[:billing].should === true
159
- result[:shipping].should === true
160
- end
161
- end
162
- end
163
- end
164
-
165
- context 'gateway' do
166
- context 'configured correctly' do
167
- before :each do
168
- login_as :customer
169
- @order = shop_orders(:one_item)
170
34
 
171
35
  mock_valid_form_checkout_request
172
36
  end
@@ -197,26 +61,33 @@ describe FormCheckout do
197
61
  @order.payment.card_type.should === @data[:card][:type]
198
62
  @order.payment.amount.should === @order.price
199
63
  end
64
+
65
+ it 'should assign session shop_order to nil' do
66
+ mock.instance_of(ActiveMerchant::Billing::CreditCard).valid? { true }
67
+ @checkout = FormCheckout.new(@form, @page)
68
+ result = @checkout.create
69
+
70
+ result[:session][:shop_order].should be_nil
71
+ end
200
72
  end
201
73
 
202
74
  context 'configured incorrectly' do
203
75
  before :each do
204
76
  login_as :customer
205
- @order = shop_orders(:one_item)
77
+ @order = shop_orders(:several_items)
206
78
 
207
79
  mock_valid_form_checkout_request
208
80
  end
209
81
  context 'no gateway' do
210
82
  it 'should return gateway false' do
211
- mock.instance_of(ActiveMerchant::Billing::CreditCard).valid? { true }
212
83
  @form[:extensions][:checkout][:gateway] = nil
213
84
 
214
85
  @checkout = FormCheckout.new(@form, @page)
215
86
  result = @checkout.create
216
87
 
217
88
  result[:gateway].should === false
218
- result[:card].should === false
219
- result[:payment].should === false
89
+ result[:card].should be_nil
90
+ result[:payment].should be_nil
220
91
 
221
92
  @order.payment.should be_nil
222
93
  end
@@ -224,15 +95,14 @@ describe FormCheckout do
224
95
 
225
96
  context 'no card' do
226
97
  it 'should return card and payment false' do
227
- mock.instance_of(ActiveMerchant::Billing::CreditCard).valid? { true }
228
98
  @data[:card] = nil
229
99
 
230
100
  @checkout = FormCheckout.new(@form, @page)
231
101
  result = @checkout.create
232
102
 
233
103
  result[:gateway].should === true
234
- result[:card].should === false
235
- result[:payment].should === false
104
+ result[:card].should be_nil
105
+ result[:payment].should be_nil
236
106
 
237
107
  @order.payment.should be_nil
238
108
  end
@@ -247,7 +117,7 @@ describe FormCheckout do
247
117
 
248
118
  result[:gateway].should === true
249
119
  result[:card].should === false
250
- result[:payment].should === false
120
+ result[:payment].should be_nil
251
121
 
252
122
  @order.payment.should be_nil
253
123
  end
@@ -263,7 +133,7 @@ describe FormCheckout do
263
133
  context 'mail configured' do
264
134
  before :each do
265
135
  login_as :customer
266
- @order = shop_orders(:one_item)
136
+ @order = shop_orders(:several_items)
267
137
 
268
138
  mock_valid_form_checkout_request
269
139
  end
@@ -293,7 +163,7 @@ describe FormCheckout do
293
163
  context 'mail not configured' do
294
164
  before :each do
295
165
  login_as :customer
296
- @order = shop_orders(:one_item)
166
+ @order = shop_orders(:several_items)
297
167
 
298
168
  mock_valid_form_checkout_request
299
169
  @form[:extensions][:checkout][:mail] = nil
@@ -0,0 +1,81 @@
1
+ require 'spec/spec_helper'
2
+
3
+ describe ShopAddress do
4
+
5
+ dataset :shop_addresses, :shop_orders
6
+
7
+ describe 'relationships' do
8
+ before :each do
9
+ @address = shop_addresses(:billing)
10
+ end
11
+
12
+ context 'billing orders' do
13
+ before :each do
14
+ @order = shop_orders(:empty)
15
+ end
16
+ it 'should have many' do
17
+ @address.billings << @order
18
+ @address.billings.include?(@order).should === true
19
+ end
20
+ end
21
+
22
+ context 'shipping orders' do
23
+ before :each do
24
+ @order = shop_orders(:empty)
25
+ end
26
+ it 'should have many' do
27
+ @address.shippings << @order
28
+ @address.shippings.include?(@order).should === true
29
+ end
30
+ end
31
+ end
32
+
33
+ describe 'validations' do
34
+ before :each do
35
+ @address = shop_addresses(:billing)
36
+ end
37
+ context 'unit' do
38
+ it 'should not require' do
39
+ @address.unit = nil
40
+ @address.valid?.should === true
41
+ end
42
+ end
43
+ context 'name' do
44
+ it 'should require' do
45
+ @address.name = nil
46
+ @address.valid?.should === false
47
+ end
48
+ end
49
+ context 'street' do
50
+ it 'should require' do
51
+ @address.street = nil
52
+ @address.valid?.should === false
53
+ end
54
+ end
55
+ context 'city' do
56
+ it 'should require' do
57
+ @address.city = nil
58
+ @address.valid?.should === false
59
+ end
60
+ end
61
+ context 'postcode' do
62
+ it 'should require' do
63
+ @address.postcode = nil
64
+ @address.valid?.should === false
65
+ end
66
+ end
67
+ context 'state' do
68
+ it 'should require' do
69
+ @address.state = nil
70
+ @address.valid?.should === false
71
+ end
72
+ end
73
+ context 'country' do
74
+ it 'should require' do
75
+ @address.country = nil
76
+ @address.valid?.should === false
77
+ end
78
+ end
79
+ end
80
+
81
+ end
@@ -1,58 +1,141 @@
1
1
  require 'spec/spec_helper'
2
2
 
3
3
  describe ShopCategory do
4
- dataset :shop_categories
5
-
6
- before(:each) do
7
- @category = shop_categories(:bread)
8
- @categories = [
9
- shop_categories(:bread),
10
- shop_categories(:milk)
11
- ]
12
- end
4
+ dataset :shop_categories, :users
13
5
 
14
- context 'attributes' do
6
+ describe 'relationships' do
7
+ before :each do
8
+ @category = shop_categories(:bread)
9
+ end
15
10
 
16
- it 'should have a title' do
17
- @category.name.should == 'bread'
11
+ it 'should have a page Page' do
12
+ @category.page.is_a?(Page).should be_true
18
13
  end
19
14
 
20
- it 'should have a handle' do
21
- @category.handle.should == 'bread'
15
+ it 'should have a created_by User' do
16
+ @category.created_by = users(:admin)
17
+ @category.created_by.is_a?(User).should be_true
22
18
  end
23
19
 
24
- it 'should have a position' do
25
- @category.position.should == 1
20
+ it 'should have a updated_by User' do
21
+ @category.updated_by = users(:admin)
22
+ @category.updated_by.is_a?(User).should be_true
26
23
  end
27
24
 
28
- it 'should have a products array' do
29
- @category.products.class.should == Array
25
+ it 'should have a product_layout Layout' do
26
+ @category.product_layout.is_a?(Layout).should be_true
27
+ end
28
+ end
29
+
30
+ describe 'validations' do
31
+ before :each do
32
+ @category = shop_categories(:bread)
30
33
  end
31
34
 
35
+ context 'page' do
36
+ it 'should require a page' do
37
+ @category.page = nil
38
+ @category.valid?.should be_false
39
+ end
40
+ end
32
41
  end
33
42
 
34
- context 'validation' do
43
+ describe 'methods' do
44
+ before :each do
45
+ @category = shop_categories(:bread)
46
+ end
35
47
 
36
- it 'should generate a valid handle on validation' do
37
- @product = ShopCategory.new({ :name => 'delicious_ _:_;_=_+_._~_bread' })
38
- @product.valid? == true
39
- @product.handle.should == 'delicious_______________bread'
48
+ context '#name' do
49
+ it 'should return page title' do
50
+ @category.name.should === @category.page.title
51
+ end
52
+ end
53
+
54
+ context '#handle' do
55
+ it 'should return a handle formatted url' do
56
+ @category.handle.should === ShopProduct.to_sku(@category.page.url)
57
+ end
58
+ end
59
+
60
+ context 'url' do
61
+ it 'should return a standard url path' do
62
+ @category.url.should === @category.page.url
63
+ end
64
+ end
65
+
66
+ context 'slug' do
67
+ it 'should return the page slug' do
68
+ @category.slug.should === @category.page.slug
69
+ end
70
+ end
71
+
72
+ context 'to_json' do
73
+ it 'should overload standard to_json' do
74
+ pending 'not sure how to write this'
75
+ # @category.to_json.should === ShopCategory.params
76
+ end
40
77
  end
41
78
 
42
- end
43
-
44
- it 'should find a category by handle' do
45
- ShopCategory.find_by_handle(@category.handle).should == @category
46
79
  end
47
80
 
48
- context 'Class Methods' do
81
+ describe 'filters' do
82
+ before :each do
83
+ @category = shop_categories(:bread)
84
+ end
49
85
 
50
- describe '#attrs' do
51
- it 'should have a set of standard parameters' do
52
- ShopCategory.attrs.should === [ :id, :handle, :description, :created_at, :updated_at ]
86
+ context 'handle' do
87
+ context 'slug' do
88
+ it 'should generate on validation' do
89
+ @category.page.slug = 'delicious_ _:_;_=_+_._~_bread'
90
+ @category.valid?
91
+ @category.page.slug.should === 'delicious_______________bread'
92
+ end
93
+ end
94
+ context 'breadcrumb' do
95
+ context 'has not been set' do
96
+ it 'should generate from the slug on validation' do
97
+ @category.page.slug = 'delicious_ _:_;_=_+_._~_bread'
98
+ @category.page.breadcrumb = nil
99
+ @category.valid?
100
+ @category.page.breadcrumb.should === 'delicious_______________bread'
101
+ end
102
+ end
103
+ context 'has been set' do
104
+ it 'should generate on validation' do
105
+ @category.page.breadcrumb = 'delicious_ _:_;_=_+_._~_bread'
106
+ @category.valid?
107
+ @category.page.breadcrumb.should === 'delicious_______________bread'
108
+ end
109
+ end
53
110
  end
54
111
  end
55
112
 
113
+ context 'product layout' do
114
+ it 'should select on validation' do
115
+ @category = shop_categories(:bread)
116
+ @category.product_layout_id = nil
117
+ @category.valid?
118
+ @category.product_layout.should === Layout.find_by_name(Radiant::Config['shop.product_layout'])
119
+ end
120
+ end
121
+ end
122
+
123
+ describe '#attrs' do
124
+ it 'should return attribute set' do
125
+ ShopCategory.attrs.should === [ :id, :product_layout_id, :page_id, :created_at, :updated_at ]
126
+ end
127
+ end
128
+
129
+ describe '#methds' do
130
+ it 'should return method set' do
131
+ ShopCategory.methds.should === [ :name, :description, :handle, :url, :created_at, :updated_at ]
132
+ end
133
+ end
134
+
135
+ describe '#params' do
136
+ it 'should return parameter set' do
137
+ ShopCategory.params.should === { :only => ShopCategory.attrs, :methods => ShopCategory.methds }
138
+ end
56
139
  end
57
140
 
58
141
  end