spree_backend 3.1.14 → 3.2.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (309) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/admin/logo.png +0 -0
  3. data/app/assets/javascripts/spree/backend/admin.js +2 -25
  4. data/app/assets/javascripts/spree/backend/checkouts/edit.js +2 -1
  5. data/app/assets/javascripts/spree/backend/line_items.js.coffee +2 -2
  6. data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js +5 -2
  7. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +2 -2
  8. data/app/assets/javascripts/spree/backend/option_value_picker.js +2 -2
  9. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +10 -8
  10. data/app/assets/javascripts/spree/backend/product_picker.js +3 -2
  11. data/app/assets/javascripts/spree/backend/{shipments.js.erb → shipments.js} +1 -1
  12. data/app/assets/javascripts/spree/backend/states.js +9 -7
  13. data/app/assets/javascripts/spree/backend/stock_location.js +3 -0
  14. data/app/assets/javascripts/spree/backend/tag_picker.js +52 -0
  15. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +2 -2
  16. data/app/assets/javascripts/spree/backend/taxon_permalink_preview.js +12 -0
  17. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +2 -2
  18. data/app/assets/javascripts/spree/backend/taxons.js.coffee +1 -1
  19. data/app/assets/javascripts/spree/backend/user_picker.js +4 -3
  20. data/app/assets/javascripts/spree/backend.js +8 -7
  21. data/app/assets/stylesheets/spree/backend/components/_main.scss +5 -1
  22. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +7 -0
  23. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +1 -1
  24. data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +0 -1
  25. data/app/controllers/spree/admin/base_controller.rb +0 -11
  26. data/app/controllers/spree/admin/option_types_controller.rb +2 -14
  27. data/app/controllers/spree/admin/option_values_controller.rb +1 -1
  28. data/app/controllers/spree/admin/orders_controller.rb +7 -7
  29. data/app/controllers/spree/admin/payment_methods_controller.rb +4 -0
  30. data/app/controllers/spree/admin/product_properties_controller.rb +1 -1
  31. data/app/controllers/spree/admin/products_controller.rb +1 -1
  32. data/app/controllers/spree/admin/promotion_actions_controller.rb +5 -5
  33. data/app/controllers/spree/admin/promotion_rules_controller.rb +6 -6
  34. data/app/controllers/spree/admin/promotions_controller.rb +2 -2
  35. data/app/controllers/spree/admin/properties_controller.rb +1 -1
  36. data/app/controllers/spree/admin/prototypes_controller.rb +2 -2
  37. data/app/controllers/spree/admin/refunds_controller.rb +1 -1
  38. data/app/controllers/spree/admin/reimbursement_types_controller.rb +26 -0
  39. data/app/controllers/spree/admin/reimbursements_controller.rb +1 -1
  40. data/app/controllers/spree/admin/reports_controller.rb +1 -1
  41. data/app/controllers/spree/admin/resource_controller.rb +8 -8
  42. data/app/controllers/spree/admin/return_authorizations_controller.rb +3 -3
  43. data/app/controllers/spree/admin/return_index_controller.rb +1 -1
  44. data/app/controllers/spree/admin/shipping_methods_controller.rb +2 -2
  45. data/app/controllers/spree/admin/states_controller.rb +1 -1
  46. data/app/controllers/spree/admin/stock_items_controller.rb +2 -2
  47. data/app/controllers/spree/admin/stock_movements_controller.rb +1 -5
  48. data/app/controllers/spree/admin/store_credits_controller.rb +1 -1
  49. data/app/controllers/spree/admin/taxons_controller.rb +1 -10
  50. data/app/controllers/spree/admin/users_controller.rb +5 -41
  51. data/app/controllers/spree/admin/variants_controller.rb +3 -1
  52. data/app/helpers/spree/admin/base_helper.rb +1 -6
  53. data/app/helpers/spree/admin/navigation_helper.rb +9 -31
  54. data/app/helpers/spree/admin/promotion_rules_helper.rb +12 -0
  55. data/app/views/kaminari/_first_page.html.erb +1 -1
  56. data/app/views/kaminari/_last_page.html.erb +1 -1
  57. data/app/views/kaminari/_next_page.html.erb +1 -1
  58. data/app/views/kaminari/_page.html.erb +1 -1
  59. data/app/views/kaminari/_paginator.html.erb +2 -4
  60. data/app/views/kaminari/_prev_page.html.erb +1 -1
  61. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +1 -1
  62. data/app/views/spree/admin/adjustments/_form.html.erb +4 -4
  63. data/app/views/spree/admin/countries/_form.html.erb +2 -2
  64. data/app/views/spree/admin/countries/edit.html.erb +3 -3
  65. data/app/views/spree/admin/countries/index.html.erb +3 -3
  66. data/app/views/spree/admin/countries/new.html.erb +3 -3
  67. data/app/views/spree/admin/customer_returns/new.html.erb +1 -1
  68. data/app/views/spree/admin/images/_form.html.erb +2 -2
  69. data/app/views/spree/admin/option_types/_form.html.erb +2 -2
  70. data/app/views/spree/admin/option_types/edit.html.erb +5 -5
  71. data/app/views/spree/admin/option_types/new.html.erb +3 -3
  72. data/app/views/spree/admin/orders/_adjustments.html.erb +6 -4
  73. data/app/views/spree/admin/orders/_form.html.erb +1 -1
  74. data/app/views/spree/admin/orders/_line_items.html.erb +8 -6
  75. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +1 -1
  76. data/app/views/spree/admin/orders/_shipment.html.erb +9 -7
  77. data/app/views/spree/admin/orders/cart.html.erb +0 -4
  78. data/app/views/spree/admin/orders/edit.html.erb +0 -4
  79. data/app/views/spree/admin/orders/index.html.erb +20 -20
  80. data/app/views/spree/admin/payment_methods/_form.html.erb +5 -5
  81. data/app/views/spree/admin/payment_methods/index.html.erb +3 -3
  82. data/app/views/spree/admin/payments/_form.html.erb +6 -6
  83. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +6 -6
  84. data/app/views/spree/admin/products/_form.html.erb +14 -8
  85. data/app/views/spree/admin/products/_properties_form.erb +1 -1
  86. data/app/views/spree/admin/products/index.html.erb +6 -6
  87. data/app/views/spree/admin/products/new.html.erb +16 -16
  88. data/app/views/spree/admin/promotion_categories/_form.html.erb +3 -3
  89. data/app/views/spree/admin/promotion_categories/edit.html.erb +3 -3
  90. data/app/views/spree/admin/promotion_categories/index.html.erb +3 -3
  91. data/app/views/spree/admin/promotion_categories/new.html.erb +3 -3
  92. data/app/views/spree/admin/promotions/_actions.html.erb +4 -4
  93. data/app/views/spree/admin/promotions/_form.html.erb +10 -10
  94. data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -1
  95. data/app/views/spree/admin/promotions/_rules.html.erb +4 -4
  96. data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +1 -1
  97. data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +2 -2
  98. data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +1 -1
  99. data/app/views/spree/admin/promotions/edit.html.erb +6 -6
  100. data/app/views/spree/admin/promotions/index.html.erb +5 -5
  101. data/app/views/spree/admin/promotions/new.html.erb +3 -3
  102. data/app/views/spree/admin/promotions/rules/_country.html.erb +6 -0
  103. data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +1 -1
  104. data/app/views/spree/admin/promotions/rules/_product.html.erb +2 -2
  105. data/app/views/spree/admin/promotions/rules/_taxon.html.erb +2 -2
  106. data/app/views/spree/admin/properties/_form.html.erb +2 -2
  107. data/app/views/spree/admin/properties/edit.html.erb +3 -3
  108. data/app/views/spree/admin/properties/index.html.erb +6 -6
  109. data/app/views/spree/admin/prototypes/_prototypes.html.erb +1 -1
  110. data/app/views/spree/admin/prototypes/available.js.erb +1 -1
  111. data/app/views/spree/admin/prototypes/edit.html.erb +3 -3
  112. data/app/views/spree/admin/prototypes/index.html.erb +3 -3
  113. data/app/views/spree/admin/prototypes/new.html.erb +3 -3
  114. data/app/views/spree/admin/prototypes/show.html.erb +1 -1
  115. data/app/views/spree/admin/refunds/edit.html.erb +2 -0
  116. data/app/views/spree/admin/refunds/new.html.erb +2 -0
  117. data/app/views/spree/admin/reimbursement_types/_form.html.erb +32 -0
  118. data/app/views/spree/admin/reimbursement_types/edit.html.erb +11 -0
  119. data/app/views/spree/admin/reimbursement_types/index.html.erb +9 -0
  120. data/app/views/spree/admin/reimbursement_types/new.html.erb +11 -0
  121. data/app/views/spree/admin/reimbursements/edit.html.erb +1 -1
  122. data/app/views/spree/admin/reports/sales_total.html.erb +1 -1
  123. data/app/views/spree/admin/return_authorizations/_form.html.erb +4 -4
  124. data/app/views/spree/admin/return_index/customer_returns.html.erb +1 -2
  125. data/app/views/spree/admin/return_index/return_authorizations.html.erb +4 -4
  126. data/app/views/spree/admin/roles/edit.html.erb +1 -1
  127. data/app/views/spree/admin/roles/new.html.erb +1 -1
  128. data/app/views/spree/admin/shared/_calculator_fields.html.erb +2 -2
  129. data/app/views/spree/admin/shared/_destroy.js.erb +1 -1
  130. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +2 -2
  131. data/app/views/spree/admin/shared/_head.html.erb +2 -1
  132. data/app/views/spree/admin/shared/_header.html.erb +4 -11
  133. data/app/views/spree/admin/shared/_index_table_options.html.erb +1 -1
  134. data/app/views/spree/admin/shared/_main_menu.html.erb +6 -0
  135. data/app/views/spree/admin/shared/_new_resource_links.html.erb +2 -2
  136. data/app/views/spree/admin/shared/_order_summary.html.erb +3 -3
  137. data/app/views/spree/admin/shared/_refunds.html.erb +1 -1
  138. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +3 -3
  139. data/app/views/spree/admin/shared/_translations.html.erb +38 -38
  140. data/app/views/spree/admin/shared/{_update_order_state.js → _update_order_state.js.erb} +3 -3
  141. data/app/views/spree/admin/shared/named_types/_index.html.erb +2 -2
  142. data/app/views/spree/admin/shipping_categories/edit.html.erb +3 -3
  143. data/app/views/spree/admin/shipping_categories/index.html.erb +3 -3
  144. data/app/views/spree/admin/shipping_categories/new.html.erb +3 -3
  145. data/app/views/spree/admin/shipping_methods/_form.html.erb +14 -14
  146. data/app/views/spree/admin/shipping_methods/edit.html.erb +3 -3
  147. data/app/views/spree/admin/shipping_methods/index.html.erb +3 -3
  148. data/app/views/spree/admin/shipping_methods/new.html.erb +3 -3
  149. data/app/views/spree/admin/states/_form.html.erb +2 -2
  150. data/app/views/spree/admin/states/_state_list.html.erb +2 -2
  151. data/app/views/spree/admin/states/edit.html.erb +3 -3
  152. data/app/views/spree/admin/states/index.html.erb +3 -3
  153. data/app/views/spree/admin/states/new.html.erb +3 -3
  154. data/app/views/spree/admin/stock_locations/_form.html.erb +0 -8
  155. data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +1 -1
  156. data/app/views/spree/admin/stock_locations/edit.html.erb +3 -3
  157. data/app/views/spree/admin/stock_locations/index.html.erb +4 -4
  158. data/app/views/spree/admin/stock_locations/new.html.erb +3 -3
  159. data/app/views/spree/admin/stock_transfers/index.html.erb +3 -3
  160. data/app/views/spree/admin/stock_transfers/new.html.erb +1 -1
  161. data/app/views/spree/admin/stock_transfers/show.html.erb +3 -3
  162. data/app/views/spree/admin/tax_categories/_form.html.erb +7 -7
  163. data/app/views/spree/admin/tax_categories/edit.html.erb +3 -3
  164. data/app/views/spree/admin/tax_categories/new.html.erb +3 -3
  165. data/app/views/spree/admin/tax_rates/_form.html.erb +5 -5
  166. data/app/views/spree/admin/tax_rates/edit.html.erb +3 -3
  167. data/app/views/spree/admin/tax_rates/new.html.erb +3 -3
  168. data/app/views/spree/admin/taxonomies/_form.html.erb +2 -2
  169. data/app/views/spree/admin/taxonomies/_js_head.html.erb +0 -5
  170. data/app/views/spree/admin/taxonomies/new.html.erb +1 -1
  171. data/app/views/spree/admin/taxons/_form.html.erb +7 -7
  172. data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
  173. data/app/views/spree/admin/taxons/edit.html.erb +0 -15
  174. data/app/views/spree/admin/taxons/index.html.erb +1 -1
  175. data/app/views/spree/admin/trackers/_form.html.erb +1 -1
  176. data/app/views/spree/admin/trackers/edit.html.erb +3 -3
  177. data/app/views/spree/admin/trackers/index.html.erb +3 -3
  178. data/app/views/spree/admin/trackers/new.html.erb +3 -3
  179. data/app/views/spree/admin/users/_addresses_form.html.erb +2 -2
  180. data/app/views/spree/admin/users/_form.html.erb +3 -3
  181. data/app/views/spree/admin/users/index.html.erb +7 -7
  182. data/app/views/spree/admin/users/items.html.erb +2 -2
  183. data/app/views/spree/admin/users/new.html.erb +3 -3
  184. data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +24 -7
  185. data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +1 -0
  186. data/app/views/spree/admin/variants/_form.html.erb +7 -7
  187. data/app/views/spree/admin/variants/new.html.erb +3 -3
  188. data/app/views/spree/admin/zones/_country_members.html.erb +1 -1
  189. data/app/views/spree/admin/zones/_form.html.erb +6 -6
  190. data/app/views/spree/admin/zones/_state_members.html.erb +1 -1
  191. data/app/views/spree/admin/zones/edit.html.erb +3 -3
  192. data/app/views/spree/admin/zones/index.html.erb +5 -5
  193. data/app/views/spree/admin/zones/new.html.erb +3 -3
  194. data/config/routes.rb +4 -12
  195. data/lib/spree/backend/engine.rb +2 -6
  196. data/spec/controllers/spree/admin/base_controller_spec.rb +46 -0
  197. data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +185 -0
  198. data/spec/controllers/spree/admin/general_settings_controller_spec.rb +41 -0
  199. data/spec/controllers/spree/admin/missing_products_controller_spec.rb +18 -0
  200. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +197 -0
  201. data/spec/controllers/spree/admin/orders_controller_spec.rb +296 -0
  202. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +49 -0
  203. data/spec/controllers/spree/admin/payments_controller_spec.rb +97 -0
  204. data/spec/controllers/spree/admin/products_controller_spec.rb +99 -0
  205. data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +21 -0
  206. data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +21 -0
  207. data/spec/controllers/spree/admin/promotions_controller_spec.rb +44 -0
  208. data/spec/controllers/spree/admin/refunds_controller_spec.rb +32 -0
  209. data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +74 -0
  210. data/spec/controllers/spree/admin/reports_controller_spec.rb +42 -0
  211. data/spec/controllers/spree/admin/resource_controller_spec.rb +252 -0
  212. data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +225 -0
  213. data/spec/controllers/spree/admin/return_index_controller_spec.rb +37 -0
  214. data/spec/controllers/spree/admin/return_items_controller_spec.rb +27 -0
  215. data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +14 -0
  216. data/spec/controllers/spree/admin/stock_items_controller_spec.rb +19 -0
  217. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +41 -0
  218. data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +41 -0
  219. data/spec/controllers/spree/admin/tax_categories_controller_spec.rb +34 -0
  220. data/spec/controllers/spree/admin/users_controller_spec.rb +161 -0
  221. data/spec/controllers/spree/admin/variants_controller_spec.rb +32 -0
  222. data/spec/features/admin/configuration/analytics_tracker_spec.rb +47 -0
  223. data/spec/features/admin/configuration/countries_spec.rb +24 -0
  224. data/spec/features/admin/configuration/general_settings_spec.rb +44 -0
  225. data/spec/features/admin/configuration/payment_methods_spec.rb +63 -0
  226. data/spec/features/admin/configuration/roles_spec.rb +47 -0
  227. data/spec/features/admin/configuration/shipping_methods_spec.rb +62 -0
  228. data/spec/features/admin/configuration/states_spec.rb +68 -0
  229. data/spec/features/admin/configuration/stock_locations_spec.rb +48 -0
  230. data/spec/features/admin/configuration/store_credit_categories_spec.rb +50 -0
  231. data/spec/features/admin/configuration/tax_categories_spec.rb +56 -0
  232. data/spec/features/admin/configuration/tax_rates_spec.rb +18 -0
  233. data/spec/features/admin/configuration/zones_spec.rb +39 -0
  234. data/spec/features/admin/homepage_spec.rb +89 -0
  235. data/spec/features/admin/locale_spec.rb +31 -0
  236. data/spec/features/admin/orders/adjustments_promotions_spec.rb +53 -0
  237. data/spec/features/admin/orders/adjustments_spec.rb +129 -0
  238. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +47 -0
  239. data/spec/features/admin/orders/customer_details_spec.rb +154 -0
  240. data/spec/features/admin/orders/line_items_spec.rb +51 -0
  241. data/spec/features/admin/orders/listing_spec.rb +224 -0
  242. data/spec/features/admin/orders/log_entries_spec.rb +55 -0
  243. data/spec/features/admin/orders/new_order_spec.rb +186 -0
  244. data/spec/features/admin/orders/order_details_spec.rb +662 -0
  245. data/spec/features/admin/orders/payments_spec.rb +231 -0
  246. data/spec/features/admin/orders/risk_analysis_spec.rb +48 -0
  247. data/spec/features/admin/orders/shipments_spec.rb +64 -0
  248. data/spec/features/admin/orders/state_changes_spec.rb +21 -0
  249. data/spec/features/admin/products/edit/images_spec.rb +86 -0
  250. data/spec/features/admin/products/edit/products_spec.rb +64 -0
  251. data/spec/features/admin/products/edit/taxons_spec.rb +41 -0
  252. data/spec/features/admin/products/edit/variants_spec.rb +56 -0
  253. data/spec/features/admin/products/option_types_spec.rb +114 -0
  254. data/spec/features/admin/products/products_spec.rb +445 -0
  255. data/spec/features/admin/products/properties_spec.rb +147 -0
  256. data/spec/features/admin/products/prototypes_spec.rb +112 -0
  257. data/spec/features/admin/products/stock_management_spec.rb +124 -0
  258. data/spec/features/admin/products/taxonomies_spec.rb +52 -0
  259. data/spec/features/admin/products/variant_spec.rb +50 -0
  260. data/spec/features/admin/promotions/adjustments_spec.rb +259 -0
  261. data/spec/features/admin/promotions/option_value_rule_spec.rb +70 -0
  262. data/spec/features/admin/promotions/tiered_calculator_spec.rb +70 -0
  263. data/spec/features/admin/refund_reasons/refund_reasons_spec.rb +57 -0
  264. data/spec/features/admin/reimbursement_type/edit_reimbursement_type_spec.rb +36 -0
  265. data/spec/features/admin/reimbursement_type/new_reimbursement_type_spec.rb +62 -0
  266. data/spec/features/admin/reports_spec.rb +61 -0
  267. data/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb +63 -0
  268. data/spec/features/admin/returns/customer_returns_spec.rb +80 -0
  269. data/spec/features/admin/returns/return_authorizations_spec.rb +152 -0
  270. data/spec/features/admin/stock_transfer_spec.rb +75 -0
  271. data/spec/features/admin/store_credits_spec.rb +93 -0
  272. data/spec/features/admin/taxons_spec.rb +47 -0
  273. data/spec/features/admin/users_spec.rb +286 -0
  274. data/spec/helpers/admin/base_helper_spec.rb +30 -0
  275. data/spec/helpers/admin/navigation_helper_spec.rb +111 -0
  276. data/spec/helpers/admin/promotion_rules_helper_spec.rb +12 -0
  277. data/spec/helpers/admin/stock_movements_helper_spec.rb +30 -0
  278. data/spec/models/spree/resource_spec.rb +48 -0
  279. data/spec/routing/admin_path_spec.rb +22 -0
  280. data/spec/spec_helper.rb +144 -0
  281. data/spec/support/appear_before_matcher.rb +8 -0
  282. data/spec/support/ror_ringer.jpeg +0 -0
  283. data/spec/test_views/spree/admin/submodule/posts/edit.html.erb +1 -0
  284. data/spec/test_views/spree/admin/submodule/posts/new.html.erb +1 -0
  285. data/spec/test_views/spree/admin/widgets/edit.html.erb +1 -0
  286. data/spec/test_views/spree/admin/widgets/new.html.erb +1 -0
  287. data/spree_backend.gemspec +4 -3
  288. data/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js +130 -154
  289. metadata +114 -34
  290. data/app/assets/images/admin/payment_banner.png +0 -0
  291. data/app/assets/images/admin/progress.gif +0 -0
  292. data/app/assets/javascripts/spree/backend/nested-attribute.js +0 -27
  293. data/app/assets/javascripts/spree/backend/orders/edit_form.js +0 -21
  294. data/app/assets/stylesheets/spree/backend/components/_variables.scss +0 -12
  295. data/app/assets/stylesheets/spree/backend/plugins/_js_tree.scss +0 -0
  296. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +0 -5
  297. data/app/controllers/spree/admin/root_controller.rb +0 -18
  298. data/app/controllers/spree/admin/search_controller.rb +0 -41
  299. data/app/helpers/spree/admin/inventory_settings_helper.rb +0 -9
  300. data/app/helpers/spree/admin/products_helper.rb +0 -29
  301. data/app/helpers/spree/admin/tables_helper.rb +0 -15
  302. data/app/helpers/spree/promotion_rules_helper.rb +0 -13
  303. data/app/views/spree/admin/inventory_units/adjust.html.erb +0 -29
  304. data/app/views/spree/admin/orders/_line_item.html.erb +0 -21
  305. data/app/views/spree/admin/refund_reasons/destroy.js.erb +0 -1
  306. data/app/views/spree/admin/return_authorization_reasons/destroy.js.erb +0 -1
  307. data/app/views/spree/admin/search/products.rabl +0 -9
  308. data/app/views/spree/admin/search/users.rabl +0 -30
  309. data/app/views/spree/admin/stock_movements/edit.html.erb +0 -17
@@ -0,0 +1,296 @@
1
+ require 'spec_helper'
2
+ require 'cancan'
3
+ require 'spree/testing_support/bar_ability'
4
+
5
+ # Ability to test access to specific model instances
6
+ class OrderSpecificAbility
7
+ include CanCan::Ability
8
+
9
+ def initialize(user)
10
+ can [:admin, :manage], Spree::Order, number: 'R987654321'
11
+ end
12
+ end
13
+
14
+ describe Spree::Admin::OrdersController, type: :controller do
15
+
16
+ context "with authorization" do
17
+ stub_authorization!
18
+
19
+ before do
20
+ request.env["HTTP_REFERER"] = "http://localhost:3000"
21
+
22
+ # ensure no respond_overrides are in effect
23
+ if Spree::BaseController.spree_responders[:OrdersController].present?
24
+ Spree::BaseController.spree_responders[:OrdersController].clear
25
+ end
26
+ end
27
+
28
+ let(:order) do
29
+ mock_model(
30
+ Spree::Order,
31
+ completed?: true,
32
+ total: 100,
33
+ number: 'R123456789',
34
+ all_adjustments: adjustments,
35
+ billing_address: mock_model(Spree::Address)
36
+ )
37
+ end
38
+
39
+ let(:adjustments) { double('adjustments') }
40
+
41
+ before do
42
+ allow(Spree::Order).to receive_message_chain(:friendly, :find).and_return(order)
43
+ end
44
+
45
+ context "#approve" do
46
+ it "approves an order" do
47
+ expect(order).to receive(:approved_by).with(controller.try_spree_current_user)
48
+ spree_put :approve, id: order.number
49
+ expect(flash[:success]).to eq Spree.t(:order_approved)
50
+ end
51
+ end
52
+
53
+ context "#cancel" do
54
+ it "cancels an order" do
55
+ expect(order).to receive(:canceled_by).with(controller.try_spree_current_user)
56
+ spree_put :cancel, id: order.number
57
+ expect(flash[:success]).to eq Spree.t(:order_canceled)
58
+ end
59
+ end
60
+
61
+ context "#resume" do
62
+ it "resumes an order" do
63
+ expect(order).to receive(:resume!)
64
+ spree_put :resume, id: order.number
65
+ expect(flash[:success]).to eq Spree.t(:order_resumed)
66
+ end
67
+ end
68
+
69
+ context "pagination" do
70
+ it "can page through the orders" do
71
+ spree_get :index, page: 2, per_page: 10
72
+ expect(assigns[:orders].offset_value).to eq(10)
73
+ expect(assigns[:orders].limit_value).to eq(10)
74
+ end
75
+ end
76
+
77
+ # Test for #3346
78
+ context "#new" do
79
+ it "a new order has the current user assigned as a creator" do
80
+ spree_get :new
81
+ expect(assigns[:order].created_by).to eq(controller.try_spree_current_user)
82
+ end
83
+ end
84
+
85
+ # Regression test for #3684
86
+ describe "#edit" do
87
+ let(:display_value) { Spree::ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END }
88
+
89
+ before do
90
+ allow(controller).to receive(:can_not_transition_without_customer_info)
91
+ allow(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true)
92
+ end
93
+
94
+ after do
95
+ spree_get :edit, id: order.number
96
+ end
97
+
98
+ it { expect(controller).to receive(:can_not_transition_without_customer_info) }
99
+ it { expect(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true) }
100
+ end
101
+
102
+ # Test for #3919
103
+ context "search" do
104
+ let(:user) { create(:user) }
105
+
106
+ before do
107
+ allow(controller).to receive_messages spree_current_user: user
108
+ user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
109
+
110
+ create(:completed_order_with_totals)
111
+ expect(Spree::Order.count).to eq 1
112
+ end
113
+
114
+ def send_request
115
+ spree_get :index, q: {
116
+ line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
117
+ }
118
+ end
119
+
120
+ it 'does not display duplicate results' do
121
+ send_request
122
+ expect(assigns[:orders].map { |o| o.number }.count).to eq 1
123
+ end
124
+
125
+ it 'preloads users' do
126
+ expect(Spree::Order).to receive(:preload).with(:user).and_return(Spree::Order.all)
127
+ send_request
128
+ end
129
+ end
130
+
131
+ context "#open_adjustments" do
132
+ let(:closed) { double('closed_adjustments') }
133
+
134
+ before do
135
+ allow(adjustments).to receive(:closed).and_return(closed)
136
+ allow(closed).to receive(:update_all)
137
+ end
138
+
139
+ it "changes all the closed adjustments to open" do
140
+ expect(adjustments).to receive(:closed).and_return(closed)
141
+ expect(closed).to receive(:update_all).with(state: 'open')
142
+ spree_post :open_adjustments, id: order.number
143
+ end
144
+
145
+ it "sets the flash success message" do
146
+ spree_post :open_adjustments, id: order.number
147
+ expect(flash[:success]).to eql('All adjustments successfully opened!')
148
+ end
149
+
150
+ context 'when referer' do
151
+ before(:each) do
152
+ request.env['HTTP_REFERER'] = root_url
153
+ end
154
+
155
+ it "redirects back" do
156
+ spree_post :open_adjustments, id: order.number
157
+ expect(response).to redirect_to(root_url)
158
+ end
159
+ end
160
+
161
+ context 'when no referer' do
162
+ before(:each) do
163
+ request.env['HTTP_REFERER'] = nil
164
+ end
165
+
166
+ it 'refirects to fallback location' do
167
+ spree_post :open_adjustments, id: order.number
168
+ expect(response).to redirect_to(admin_order_adjustments_url(order))
169
+ end
170
+ end
171
+ end
172
+
173
+ context "#close_adjustments" do
174
+ let(:open) { double('open_adjustments') }
175
+
176
+ before do
177
+ allow(adjustments).to receive(:open).and_return(open)
178
+ allow(open).to receive(:update_all)
179
+ end
180
+
181
+ it "changes all the open adjustments to closed" do
182
+ expect(adjustments).to receive(:open).and_return(open)
183
+ expect(open).to receive(:update_all).with(state: 'closed')
184
+ spree_post :close_adjustments, id: order.number
185
+ end
186
+
187
+ it "sets the flash success message" do
188
+ spree_post :close_adjustments, id: order.number
189
+ expect(flash[:success]).to eql('All adjustments successfully closed!')
190
+ end
191
+
192
+ context 'when referer' do
193
+ before(:each) do
194
+ request.env['HTTP_REFERER'] = root_url
195
+ end
196
+
197
+ it "redirects back" do
198
+ spree_post :close_adjustments, id: order.number
199
+ expect(response).to redirect_to(root_url)
200
+ end
201
+ end
202
+
203
+ context 'when no referer' do
204
+ before(:each) do
205
+ request.env['HTTP_REFERER'] = nil
206
+ end
207
+
208
+ it 'refirects to fallback location' do
209
+ spree_post :close_adjustments, id: order.number
210
+ expect(response).to redirect_to(admin_order_adjustments_url(order))
211
+ end
212
+ end
213
+ end
214
+ end
215
+
216
+ context '#authorize_admin' do
217
+ let(:user) { create(:user) }
218
+ let(:order) { create(:completed_order_with_totals, number: 'R987654321') }
219
+
220
+ def with_ability(ability)
221
+ Spree::Ability.register_ability(ability)
222
+ yield
223
+ ensure
224
+ Spree::Ability.remove_ability(ability)
225
+ end
226
+
227
+ before do
228
+ allow(Spree::Order).to receive_messages find: order
229
+ allow(controller).to receive_messages spree_current_user: user
230
+ end
231
+
232
+ it 'should grant access to users with an admin role' do
233
+ user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
234
+ spree_post :index
235
+ expect(response).to render_template :index
236
+ end
237
+
238
+ it 'should grant access to users with an bar role' do
239
+ with_ability(BarAbility) do
240
+ user.spree_roles << Spree::Role.find_or_create_by(name: 'bar')
241
+ spree_post :index
242
+ expect(response).to render_template :index
243
+ end
244
+ end
245
+
246
+ it 'should deny access to users with an bar role' do
247
+ with_ability(BarAbility) do
248
+ allow(order).to receive(:update_attributes).and_return true
249
+ allow(order).to receive(:user).and_return Spree.user_class.new
250
+ allow(order).to receive(:token).and_return nil
251
+ user.spree_roles.clear
252
+ user.spree_roles << Spree::Role.find_or_create_by(name: 'bar')
253
+ spree_put :update, id: order.number
254
+ expect(response).to redirect_to(spree.forbidden_path)
255
+ end
256
+ end
257
+
258
+ it 'should deny access to users without an admin role' do
259
+ allow(user).to receive_messages has_spree_role?: false
260
+ spree_post :index
261
+ expect(response).to redirect_to(spree.forbidden_path)
262
+ end
263
+
264
+ it 'should deny access to not signed in users' do
265
+ allow(controller).to receive_messages spree_current_user: nil
266
+ spree_get :index
267
+ expect(response).to redirect_to(spree.root_path)
268
+ end
269
+
270
+ it 'should restrict returned order(s) on index when using OrderSpecificAbility' do
271
+ number = order.number
272
+
273
+ 3.times { create(:completed_order_with_totals) }
274
+ expect(Spree::Order.complete.count).to eq 4
275
+
276
+ with_ability(OrderSpecificAbility) do
277
+ allow(user).to receive_messages has_spree_role?: false
278
+ spree_get :index
279
+ expect(response).to render_template :index
280
+ expect(assigns['orders'].size).to eq 1
281
+ expect(assigns['orders'].first.number).to eq number
282
+ expect(Spree::Order.accessible_by(Spree::Ability.new(user), :index).pluck(:number)).to eq [number]
283
+ end
284
+ end
285
+ end
286
+
287
+ context "order number not given" do
288
+ stub_authorization!
289
+
290
+ it "raise active record not found" do
291
+ expect {
292
+ spree_get :edit, id: 99999999
293
+ }.to raise_error ActiveRecord::RecordNotFound
294
+ end
295
+ end
296
+ end
@@ -0,0 +1,49 @@
1
+ require 'spec_helper'
2
+
3
+ module Spree
4
+ class GatewayWithPassword < PaymentMethod
5
+ preference :password, :string, default: "password"
6
+ end
7
+
8
+ describe Admin::PaymentMethodsController, type: :controller do
9
+ stub_authorization!
10
+
11
+ let(:payment_method) { GatewayWithPassword.create!(name: "Bogus", preferred_password: "haxme") }
12
+
13
+ # regression test for #2094
14
+ it "does not clear password on update" do
15
+ expect(payment_method.preferred_password).to eq("haxme")
16
+ spree_put :update, id: payment_method.id, payment_method: { type: payment_method.class.to_s, preferred_password: "" }
17
+ expect(response).to redirect_to(spree.edit_admin_payment_method_path(payment_method))
18
+
19
+ payment_method.reload
20
+ expect(payment_method.preferred_password).to eq("haxme")
21
+ end
22
+
23
+ context "tries to save invalid payment" do
24
+ it "doesn't break, responds nicely" do
25
+ expect {
26
+ spree_post :create, payment_method: { name: "", type: "Spree::Gateway::Bogus" }
27
+ }.not_to raise_error
28
+ end
29
+ end
30
+
31
+ it "can create a payment method of a valid type" do
32
+ expect {
33
+ spree_post :create, payment_method: { name: "Test Method", type: "Spree::Gateway::Bogus" }
34
+ }.to change(Spree::PaymentMethod, :count).by(1)
35
+
36
+ expect(response).to be_redirect
37
+ expect(response).to redirect_to spree.edit_admin_payment_method_path(assigns(:payment_method))
38
+ end
39
+
40
+ it "can not create a payment method of an invalid type" do
41
+ expect {
42
+ spree_post :create, payment_method: { name: "Invalid Payment Method", type: "Spree::InvalidType" }
43
+ }.to change(Spree::PaymentMethod, :count).by(0)
44
+
45
+ expect(response).to be_redirect
46
+ expect(response).to redirect_to spree.new_admin_payment_method_path
47
+ end
48
+ end
49
+ end
@@ -0,0 +1,97 @@
1
+ require 'spec_helper'
2
+
3
+ module Spree
4
+ module Admin
5
+ describe PaymentsController, type: :controller do
6
+ stub_authorization!
7
+
8
+ let(:order) { create(:order) }
9
+
10
+ context "with a valid credit card" do
11
+ let(:order) { create(:order_with_line_items, state: "payment") }
12
+ let(:payment_method) { create(:credit_card_payment_method, display_on: "back_end") }
13
+
14
+ before do
15
+ attributes = {
16
+ order_id: order.number,
17
+ card: "new",
18
+ payment: {
19
+ amount: order.total,
20
+ payment_method_id: payment_method.id.to_s,
21
+ source_attributes: {
22
+ name: "Test User",
23
+ number: "4111 1111 1111 1111",
24
+ expiry: "09 / #{Time.current.year + 1}",
25
+ verification_value: "123"
26
+ }
27
+ }
28
+ }
29
+ spree_post :create, attributes
30
+ end
31
+
32
+ it "should process payment correctly" do
33
+ expect(order.payments.count).to eq(1)
34
+ expect(response).to redirect_to(spree.admin_order_payments_path(order))
35
+ expect(order.reload.state).to eq('complete')
36
+ end
37
+
38
+ # Regression for #4768
39
+ it "doesnt process the same payment twice" do
40
+ expect(Spree::LogEntry.where(source: order.payments.first).count).to eq(1)
41
+ end
42
+ end
43
+
44
+ # Regression test for #3233
45
+ context "with a backend payment method" do
46
+ before do
47
+ @payment_method = create(:check_payment_method, display_on: "back_end")
48
+ end
49
+
50
+ it "loads backend payment methods" do
51
+ spree_get :new, order_id: order.number
52
+ expect(response.status).to eq(200)
53
+ expect(assigns[:payment_methods]).to include(@payment_method)
54
+ end
55
+ end
56
+
57
+ context "order has billing address" do
58
+ before do
59
+ order.bill_address = create(:address)
60
+ order.save!
61
+ end
62
+
63
+ context "order does not have payments" do
64
+ it "redirect to new payments page" do
65
+ spree_get :index, { amount: 100, order_id: order.number }
66
+ expect(response).to redirect_to(spree.new_admin_order_payment_path(order))
67
+ end
68
+ end
69
+
70
+ context "order has payments" do
71
+ before do
72
+ order.payments << create(:payment, amount: order.total, order: order, state: 'completed')
73
+ end
74
+
75
+ it "shows the payments page" do
76
+ spree_get :index, { amount: 100, order_id: order.number }
77
+ expect(response.code).to eq "200"
78
+ end
79
+ end
80
+
81
+ end
82
+
83
+ context "order does not have a billing address" do
84
+ before do
85
+ order.bill_address = nil
86
+ order.save
87
+ end
88
+
89
+ it "should redirect to the customer details page" do
90
+ spree_get :index, { amount: 100, order_id: order.number }
91
+ expect(response).to redirect_to(spree.edit_admin_order_customer_path(order))
92
+ end
93
+ end
94
+
95
+ end
96
+ end
97
+ end
@@ -0,0 +1,99 @@
1
+ require 'spec_helper'
2
+
3
+ describe Spree::Admin::ProductsController, type: :controller do
4
+ stub_authorization!
5
+
6
+ context "#index" do
7
+ let(:ability_user) { stub_model(Spree::LegacyUser, has_spree_role?: true) }
8
+
9
+ # Regression test for #1259
10
+ it "can find a product by SKU" do
11
+ product = create(:product, sku: "ABC123")
12
+ spree_get :index, q: { sku_start: "ABC123" }
13
+ expect(assigns[:collection]).not_to be_empty
14
+ expect(assigns[:collection]).to include(product)
15
+ end
16
+ end
17
+
18
+ # regression test for #1370
19
+ context "adding properties to a product" do
20
+ let!(:product) { create(:product) }
21
+ specify do
22
+ spree_put :update, id: product.to_param, product: { product_properties_attributes: { "1" => { property_name: "Foo", value: "bar" } } }
23
+ expect(flash[:success]).to eq("Product #{product.name.inspect} has been successfully updated!")
24
+ end
25
+
26
+ end
27
+
28
+ # regression test for #801
29
+ describe '#destroy' do
30
+ let(:product) { mock_model(Spree::Product) }
31
+ let(:products) { double(ActiveRecord::Relation) }
32
+
33
+ def send_request
34
+ spree_delete :destroy, id: product, format: :js
35
+ end
36
+
37
+ context 'will successfully destroy product' do
38
+ before do
39
+ allow(Spree::Product).to receive(:friendly).and_return(products)
40
+ allow(products).to receive(:find).with(product.id.to_s).and_return(product)
41
+ allow(product).to receive(:destroy).and_return(true)
42
+ end
43
+
44
+ describe 'expects to receive' do
45
+ it { expect(Spree::Product).to receive(:friendly).and_return(products) }
46
+ it { expect(products).to receive(:find).with(product.id.to_s).and_return(product) }
47
+ it { expect(product).to receive(:destroy).and_return(true) }
48
+
49
+ after { send_request }
50
+ end
51
+
52
+ describe 'assigns' do
53
+ before { send_request }
54
+ it { expect(assigns(:product)).to eq(product) }
55
+ end
56
+
57
+ describe 'response' do
58
+ before { send_request }
59
+ it { expect(response).to have_http_status(:ok) }
60
+ it { expect(flash[:success]).to eq(Spree.t('notice_messages.product_deleted')) }
61
+ end
62
+ end
63
+
64
+ context 'will not successfully destroy product' do
65
+ before do
66
+ allow(Spree::Product).to receive(:friendly).and_return(products)
67
+ allow(products).to receive(:find).with(product.id.to_s).and_return(product)
68
+ allow(product).to receive(:destroy).and_return(false)
69
+ end
70
+
71
+ describe 'expects to receive' do
72
+ it { expect(Spree::Product).to receive(:friendly).and_return(products) }
73
+ it { expect(products).to receive(:find).with(product.id.to_s).and_return(product) }
74
+ it { expect(product).to receive(:destroy).and_return(false) }
75
+
76
+ after { send_request }
77
+ end
78
+
79
+ describe 'assigns' do
80
+ before { send_request }
81
+ it { expect(assigns(:product)).to eq(product) }
82
+ end
83
+
84
+ describe 'response' do
85
+ before { send_request }
86
+ it { expect(response).to have_http_status(:ok) }
87
+ it { expect(flash[:error]).to eq(Spree.t('notice_messages.product_not_deleted')) }
88
+ end
89
+ end
90
+ end
91
+
92
+ context "stock" do
93
+ let(:product) { create(:product) }
94
+ it "restricts stock location based on accessible attributes" do
95
+ expect(Spree::StockLocation).to receive(:accessible_by).and_return([])
96
+ spree_get :stock, id: product
97
+ end
98
+ end
99
+ end
@@ -0,0 +1,21 @@
1
+ require 'spec_helper'
2
+
3
+ describe Spree::Admin::PromotionActionsController, type: :controller do
4
+ stub_authorization!
5
+
6
+ let!(:promotion) { create(:promotion) }
7
+
8
+ it "can create a promotion action of a valid type" do
9
+ spree_post :create, promotion_id: promotion.id, action_type: "Spree::Promotion::Actions::CreateAdjustment"
10
+ expect(response).to be_redirect
11
+ expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
12
+ expect(promotion.actions.count).to eq(1)
13
+ end
14
+
15
+ it "can not create a promotion action of an invalid type" do
16
+ spree_post :create, promotion_id: promotion.id, action_type: "Spree::InvalidType"
17
+ expect(response).to be_redirect
18
+ expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
19
+ expect(promotion.rules.count).to eq(0)
20
+ end
21
+ end
@@ -0,0 +1,21 @@
1
+ require 'spec_helper'
2
+
3
+ describe Spree::Admin::PromotionRulesController, type: :controller do
4
+ stub_authorization!
5
+
6
+ let!(:promotion) { create(:promotion) }
7
+
8
+ it "can create a promotion rule of a valid type" do
9
+ spree_post :create, promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" }
10
+ expect(response).to be_redirect
11
+ expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
12
+ expect(promotion.rules.count).to eq(1)
13
+ end
14
+
15
+ it "can not create a promotion rule of an invalid type" do
16
+ spree_post :create, promotion_id: promotion.id, promotion_rule: { type: "Spree::InvalidType" }
17
+ expect(response).to be_redirect
18
+ expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
19
+ expect(promotion.rules.count).to eq(0)
20
+ end
21
+ end
@@ -0,0 +1,44 @@
1
+ require 'spec_helper'
2
+
3
+ describe Spree::Admin::PromotionsController, type: :controller do
4
+ stub_authorization!
5
+
6
+ let!(:promotion1) { create(:promotion, name: "name1", code: "code1", path: "path1") }
7
+ let!(:promotion2) { create(:promotion, name: "name2", code: "code2", path: "path2") }
8
+ let!(:category) { create :promotion_category }
9
+
10
+ context "#index" do
11
+ it "succeeds" do
12
+ spree_get :index
13
+ expect(assigns[:promotions]).to match_array [promotion2, promotion1]
14
+ end
15
+
16
+ it "assigns promotion categories" do
17
+ spree_get :index
18
+ expect(assigns[:promotion_categories]).to match_array [category]
19
+ end
20
+
21
+ context "search" do
22
+ it "pages results" do
23
+ spree_get :index, per_page: '1'
24
+ expect(assigns[:promotions]).to eq [promotion2]
25
+ end
26
+
27
+ it "filters by name" do
28
+ spree_get :index, q: {name_cont: promotion1.name}
29
+ expect(assigns[:promotions]).to eq [promotion1]
30
+ end
31
+
32
+ it "filters by code" do
33
+ spree_get :index, q: {code_cont: promotion1.code}
34
+ expect(assigns[:promotions]).to eq [promotion1]
35
+ end
36
+
37
+ it "filters by path" do
38
+ spree_get :index, q: {path_cont: promotion1.path}
39
+ expect(assigns[:promotions]).to eq [promotion1]
40
+ end
41
+ end
42
+ end
43
+
44
+ end
@@ -0,0 +1,32 @@
1
+ require 'spec_helper'
2
+
3
+ describe Spree::Admin::RefundsController do
4
+ stub_authorization!
5
+
6
+ describe "POST create" do
7
+ context "a Spree::Core::GatewayError is raised" do
8
+
9
+ let(:payment) { create(:payment) }
10
+
11
+ subject do
12
+ spree_post :create,
13
+ refund: { amount: "50.0", refund_reason_id: "1" },
14
+ order_id: payment.order.to_param,
15
+ payment_id: payment.to_param
16
+ end
17
+
18
+ before(:each) do
19
+ def controller.create
20
+ raise Spree::Core::GatewayError.new('An error has occurred')
21
+ end
22
+ end
23
+
24
+ it "sets an error message with the correct text" do
25
+ subject
26
+ expect(flash[:error]).to eq 'An error has occurred'
27
+ end
28
+
29
+ it { should render_template(:new) }
30
+ end
31
+ end
32
+ end