spree_backend 3.2.9 → 3.3.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/admin.js +16 -15
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +25 -26
- data/app/assets/javascripts/spree/backend/general_settings.js.coffee +10 -12
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +4 -6
- data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +7 -1
- data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee +4 -1
- data/app/assets/javascripts/spree/backend/user_picker.js +3 -1
- data/app/assets/javascripts/spree/backend.js +3 -3
- data/app/controllers/spree/admin/countries_controller.rb +1 -0
- data/app/controllers/spree/admin/log_entries_controller.rb +2 -2
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +5 -6
- data/app/controllers/spree/admin/orders_controller.rb +4 -4
- data/app/controllers/spree/admin/payments_controller.rb +21 -10
- data/app/controllers/spree/admin/products_controller.rb +5 -0
- data/app/controllers/spree/admin/promotion_rules_controller.rb +11 -7
- data/app/controllers/spree/admin/stock_transfers_controller.rb +1 -1
- data/app/controllers/spree/admin/taxons_controller.rb +31 -23
- data/app/helpers/spree/admin/base_helper.rb +1 -1
- data/app/helpers/spree/admin/navigation_helper.rb +10 -4
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +2 -2
- data/app/views/spree/admin/general_settings/edit.html.erb +8 -8
- data/app/views/spree/admin/images/_form.html.erb +2 -2
- data/app/views/spree/admin/images/edit.html.erb +2 -2
- data/app/views/spree/admin/images/new.html.erb +1 -1
- data/app/views/spree/admin/option_types/_form.html.erb +2 -2
- data/app/views/spree/admin/option_types/index.html.erb +4 -4
- data/app/views/spree/admin/orders/_line_items.html.erb +40 -38
- data/app/views/spree/admin/orders/_shipment.html.erb +77 -76
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +5 -5
- data/app/views/spree/admin/orders/index.html.erb +16 -16
- data/app/views/spree/admin/payment_methods/_form.html.erb +2 -2
- data/app/views/spree/admin/payments/_list.html.erb +1 -1
- data/app/views/spree/admin/products/_add_stock_form.html.erb +3 -3
- data/app/views/spree/admin/products/_form.html.erb +16 -16
- data/app/views/spree/admin/products/index.html.erb +4 -4
- data/app/views/spree/admin/products/new.html.erb +8 -8
- data/app/views/spree/admin/promotion_categories/index.html.erb +3 -3
- data/app/views/spree/admin/promotions/_form.html.erb +3 -3
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +2 -2
- data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +2 -2
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +2 -4
- data/app/views/spree/admin/promotions/edit.html.erb +3 -3
- data/app/views/spree/admin/promotions/index.html.erb +6 -6
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +4 -4
- data/app/views/spree/admin/properties/_form.html.erb +2 -2
- data/app/views/spree/admin/properties/index.html.erb +6 -6
- data/app/views/spree/admin/prototypes/index.html.erb +4 -4
- data/app/views/spree/admin/reimbursement_types/_form.html.erb +4 -4
- data/app/views/spree/admin/reimbursements/edit.html.erb +1 -1
- data/app/views/spree/admin/return_authorizations/_form.html.erb +13 -1
- data/app/views/spree/admin/return_index/customer_returns.html.erb +2 -2
- data/app/views/spree/admin/return_index/return_authorizations.html.erb +5 -5
- data/app/views/spree/admin/shared/_content_header.html.erb +2 -2
- data/app/views/spree/admin/shared/_header.html.erb +2 -2
- data/app/views/spree/admin/shared/_index_table_options.html.erb +2 -2
- data/app/views/spree/admin/shared/_order_summary.html.erb +1 -1
- data/app/views/spree/admin/shared/_table_filter.html.erb +1 -1
- data/app/views/spree/admin/shared/_translations.html.erb +0 -1
- data/app/views/spree/admin/shared/_update_order_state.js.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +10 -10
- data/app/views/spree/admin/state_changes/index.html.erb +3 -3
- data/app/views/spree/admin/states/_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +4 -4
- data/app/views/spree/admin/stock_transfers/index.html.erb +3 -3
- data/app/views/spree/admin/stock_transfers/new.html.erb +2 -2
- data/app/views/spree/admin/store_credits/index.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/_form.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/_list.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/{edit.erb → edit.html.erb} +0 -0
- data/app/views/spree/admin/taxonomies/index.html.erb +2 -2
- data/app/views/spree/admin/taxons/_form.html.erb +5 -5
- data/app/views/spree/admin/taxons/edit.html.erb +3 -0
- data/app/views/spree/admin/trackers/_form.html.erb +2 -2
- data/app/views/spree/admin/users/_addresses_form.html.erb +2 -2
- data/app/views/spree/admin/users/_form.html.erb +2 -2
- data/app/views/spree/admin/users/_user_page_actions.html.erb +1 -1
- data/app/views/spree/admin/users/index.html.erb +5 -5
- data/app/views/spree/admin/users/items.html.erb +1 -1
- data/app/views/spree/admin/users/orders.html.erb +1 -1
- data/app/views/spree/admin/variants/_form.html.erb +2 -2
- data/app/views/spree/admin/zones/_form.html.erb +2 -2
- data/app/views/spree/layouts/admin.html.erb +3 -3
- data/config/initializers/assets.rb +1 -1
- data/lib/spree/backend/engine.rb +0 -1
- data/spec/controllers/spree/admin/base_controller_spec.rb +46 -0
- data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +185 -0
- data/spec/controllers/spree/admin/general_settings_controller_spec.rb +41 -0
- data/spec/controllers/spree/admin/missing_products_controller_spec.rb +18 -0
- data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +199 -0
- data/spec/controllers/spree/admin/orders_controller_spec.rb +296 -0
- data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +64 -0
- data/spec/controllers/spree/admin/payments_controller_spec.rb +97 -0
- data/spec/controllers/spree/admin/products_controller_spec.rb +137 -0
- data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +21 -0
- data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +21 -0
- data/spec/controllers/spree/admin/promotions_controller_spec.rb +44 -0
- data/spec/controllers/spree/admin/refunds_controller_spec.rb +32 -0
- data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +74 -0
- data/spec/controllers/spree/admin/reports_controller_spec.rb +42 -0
- data/spec/controllers/spree/admin/resource_controller_spec.rb +252 -0
- data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +225 -0
- data/spec/controllers/spree/admin/return_index_controller_spec.rb +37 -0
- data/spec/controllers/spree/admin/return_items_controller_spec.rb +27 -0
- data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +14 -0
- data/spec/controllers/spree/admin/stock_items_controller_spec.rb +19 -0
- data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +41 -0
- data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +41 -0
- data/spec/controllers/spree/admin/tax_categories_controller_spec.rb +34 -0
- data/spec/controllers/spree/admin/users_controller_spec.rb +161 -0
- data/spec/controllers/spree/admin/variants_controller_spec.rb +32 -0
- data/spec/features/admin/configuration/analytics_tracker_spec.rb +47 -0
- data/spec/features/admin/configuration/countries_spec.rb +24 -0
- data/spec/features/admin/configuration/general_settings_spec.rb +44 -0
- data/spec/features/admin/configuration/payment_methods_spec.rb +63 -0
- data/spec/features/admin/configuration/roles_spec.rb +47 -0
- data/spec/features/admin/configuration/shipping_methods_spec.rb +62 -0
- data/spec/features/admin/configuration/states_spec.rb +68 -0
- data/spec/features/admin/configuration/stock_locations_spec.rb +48 -0
- data/spec/features/admin/configuration/store_credit_categories_spec.rb +50 -0
- data/spec/features/admin/configuration/tax_categories_spec.rb +56 -0
- data/spec/features/admin/configuration/tax_rates_spec.rb +18 -0
- data/spec/features/admin/configuration/zones_spec.rb +39 -0
- data/spec/features/admin/homepage_spec.rb +89 -0
- data/spec/features/admin/locale_spec.rb +31 -0
- data/spec/features/admin/orders/adjustments_promotions_spec.rb +53 -0
- data/spec/features/admin/orders/adjustments_spec.rb +124 -0
- data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +47 -0
- data/spec/features/admin/orders/customer_details_spec.rb +154 -0
- data/spec/features/admin/orders/line_items_spec.rb +51 -0
- data/spec/features/admin/orders/listing_spec.rb +224 -0
- data/spec/features/admin/orders/log_entries_spec.rb +55 -0
- data/spec/features/admin/orders/new_order_spec.rb +186 -0
- data/spec/features/admin/orders/order_details_spec.rb +660 -0
- data/spec/features/admin/orders/payments_spec.rb +244 -0
- data/spec/features/admin/orders/risk_analysis_spec.rb +48 -0
- data/spec/features/admin/orders/shipments_spec.rb +64 -0
- data/spec/features/admin/orders/state_changes_spec.rb +21 -0
- data/spec/features/admin/products/edit/images_spec.rb +86 -0
- data/spec/features/admin/products/edit/products_spec.rb +56 -0
- data/spec/features/admin/products/edit/taxons_spec.rb +41 -0
- data/spec/features/admin/products/edit/variants_spec.rb +56 -0
- data/spec/features/admin/products/option_types_spec.rb +114 -0
- data/spec/features/admin/products/products_spec.rb +445 -0
- data/spec/features/admin/products/properties_spec.rb +147 -0
- data/spec/features/admin/products/prototypes_spec.rb +112 -0
- data/spec/features/admin/products/stock_management_spec.rb +124 -0
- data/spec/features/admin/products/taxonomies_spec.rb +52 -0
- data/spec/features/admin/products/variant_spec.rb +50 -0
- data/spec/features/admin/promotions/adjustments_spec.rb +258 -0
- data/spec/features/admin/promotions/option_value_rule_spec.rb +70 -0
- data/spec/features/admin/promotions/tiered_calculator_spec.rb +70 -0
- data/spec/features/admin/refund_reasons/refund_reasons_spec.rb +57 -0
- data/spec/features/admin/reimbursement_type/edit_reimbursement_type_spec.rb +36 -0
- data/spec/features/admin/reimbursement_type/new_reimbursement_type_spec.rb +62 -0
- data/spec/features/admin/reports_spec.rb +61 -0
- data/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb +63 -0
- data/spec/features/admin/returns/customer_returns_spec.rb +80 -0
- data/spec/features/admin/returns/return_authorizations_spec.rb +152 -0
- data/spec/features/admin/stock_transfer_spec.rb +91 -0
- data/spec/features/admin/store_credits_spec.rb +93 -0
- data/spec/features/admin/taxons_spec.rb +53 -0
- data/spec/features/admin/users_spec.rb +286 -0
- data/spec/helpers/admin/base_helper_spec.rb +30 -0
- data/spec/helpers/admin/navigation_helper_spec.rb +111 -0
- data/spec/helpers/admin/promotion_rules_helper_spec.rb +12 -0
- data/spec/helpers/admin/stock_movements_helper_spec.rb +30 -0
- data/spec/models/spree/resource_spec.rb +48 -0
- data/spec/routing/admin_path_spec.rb +22 -0
- data/spec/spec_helper.rb +144 -0
- data/spec/support/appear_before_matcher.rb +8 -0
- data/spec/support/ror_ringer.jpeg +0 -0
- data/spec/test_views/spree/admin/submodule/posts/edit.html.erb +1 -0
- data/spec/test_views/spree/admin/submodule/posts/new.html.erb +1 -0
- data/spec/test_views/spree/admin/widgets/edit.html.erb +1 -0
- data/spec/test_views/spree/admin/widgets/new.html.erb +1 -0
- data/spree_backend.gemspec +4 -4
- data/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js +130 -154
- metadata +106 -29
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
- data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +0 -357
data/spec/spec_helper.rb
ADDED
@@ -0,0 +1,144 @@
|
|
1
|
+
if ENV["COVERAGE"]
|
2
|
+
# Run Coverage report
|
3
|
+
require 'simplecov'
|
4
|
+
SimpleCov.start do
|
5
|
+
add_group 'Controllers', 'app/controllers'
|
6
|
+
add_group 'Helpers', 'app/helpers'
|
7
|
+
add_group 'Mailers', 'app/mailers'
|
8
|
+
add_group 'Models', 'app/models'
|
9
|
+
add_group 'Views', 'app/views'
|
10
|
+
add_group 'Libraries', 'lib'
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
# This file is copied to ~/spec when you run 'ruby script/generate rspec'
|
15
|
+
# from the project root directory.
|
16
|
+
ENV["RAILS_ENV"] ||= 'test'
|
17
|
+
|
18
|
+
begin
|
19
|
+
require File.expand_path("../dummy/config/environment", __FILE__)
|
20
|
+
rescue LoadError
|
21
|
+
puts "Could not load dummy application. Please ensure you have run `bundle exec rake test_app`"
|
22
|
+
exit
|
23
|
+
end
|
24
|
+
|
25
|
+
require 'rspec/rails'
|
26
|
+
|
27
|
+
# Requires supporting files with custom matchers and macros, etc,
|
28
|
+
# in ./support/ and its subdirectories.
|
29
|
+
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
|
30
|
+
|
31
|
+
require 'database_cleaner'
|
32
|
+
require 'ffaker'
|
33
|
+
require 'timeout'
|
34
|
+
|
35
|
+
require 'spree/testing_support/authorization_helpers'
|
36
|
+
require 'spree/testing_support/factories'
|
37
|
+
require 'spree/testing_support/preferences'
|
38
|
+
require 'spree/testing_support/controller_requests'
|
39
|
+
require 'spree/testing_support/flash'
|
40
|
+
require 'spree/testing_support/url_helpers'
|
41
|
+
require 'spree/testing_support/order_walkthrough'
|
42
|
+
require 'spree/testing_support/capybara_ext'
|
43
|
+
require 'spree/testing_support/shoulda_matcher_configuration'
|
44
|
+
|
45
|
+
require 'spree/core/controller_helpers/strong_parameters'
|
46
|
+
|
47
|
+
require 'paperclip/matchers'
|
48
|
+
|
49
|
+
require 'capybara-screenshot/rspec'
|
50
|
+
Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
|
51
|
+
|
52
|
+
require 'capybara/poltergeist'
|
53
|
+
Capybara.javascript_driver = :poltergeist
|
54
|
+
|
55
|
+
# Set timeout to something high enough to allow CI to pass
|
56
|
+
Capybara.default_max_wait_time = 30
|
57
|
+
|
58
|
+
RSpec.configure do |config|
|
59
|
+
config.color = true
|
60
|
+
config.fail_fast = ENV['FAIL_FAST'] || false
|
61
|
+
config.infer_spec_type_from_file_location!
|
62
|
+
config.mock_with :rspec
|
63
|
+
config.raise_errors_for_deprecations!
|
64
|
+
|
65
|
+
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
66
|
+
# examples within a transaction, comment the following line or assign false
|
67
|
+
# instead of true.
|
68
|
+
config.use_transactional_fixtures = false
|
69
|
+
|
70
|
+
config.before :suite do
|
71
|
+
Capybara.match = :prefer_exact
|
72
|
+
DatabaseCleaner.clean_with :truncation
|
73
|
+
end
|
74
|
+
|
75
|
+
config.before(:each) do
|
76
|
+
Rails.cache.clear
|
77
|
+
WebMock.disable!
|
78
|
+
if RSpec.current_example.metadata[:js]
|
79
|
+
DatabaseCleaner.strategy = :truncation
|
80
|
+
else
|
81
|
+
DatabaseCleaner.strategy = :transaction
|
82
|
+
end
|
83
|
+
# TODO: Find out why open_transactions ever gets below 0
|
84
|
+
# See issue #3428
|
85
|
+
if ApplicationRecord.connection.open_transactions < 0
|
86
|
+
ApplicationRecord.connection.increment_open_transactions
|
87
|
+
end
|
88
|
+
|
89
|
+
DatabaseCleaner.start
|
90
|
+
reset_spree_preferences
|
91
|
+
end
|
92
|
+
|
93
|
+
config.after(:each) do
|
94
|
+
# wait_for_ajax sometimes fails so we should clean db first to get rid of false failed specs
|
95
|
+
DatabaseCleaner.clean
|
96
|
+
|
97
|
+
# Ensure js requests finish processing before advancing to the next test
|
98
|
+
wait_for_ajax if RSpec.current_example.metadata[:js]
|
99
|
+
end
|
100
|
+
|
101
|
+
config.around do |example|
|
102
|
+
Timeout.timeout(30, &example)
|
103
|
+
end
|
104
|
+
|
105
|
+
config.after(:each, type: :feature) do |example|
|
106
|
+
missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/)
|
107
|
+
if missing_translations.any?
|
108
|
+
puts "Found missing translations: #{missing_translations.inspect}"
|
109
|
+
puts "In spec: #{example.location}"
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
config.include FactoryGirl::Syntax::Methods
|
114
|
+
|
115
|
+
config.include Spree::TestingSupport::Preferences
|
116
|
+
config.include Spree::TestingSupport::UrlHelpers
|
117
|
+
config.include Spree::TestingSupport::ControllerRequests, type: :controller
|
118
|
+
config.include Spree::TestingSupport::Flash
|
119
|
+
|
120
|
+
config.include Spree::Core::ControllerHelpers::StrongParameters, type: :controller
|
121
|
+
|
122
|
+
config.include Paperclip::Shoulda::Matchers
|
123
|
+
|
124
|
+
config.extend WithModel
|
125
|
+
|
126
|
+
config.include VersionCake::TestHelpers, type: :controller
|
127
|
+
config.before(:each, type: :controller) do
|
128
|
+
set_request_version('', 1)
|
129
|
+
end
|
130
|
+
end
|
131
|
+
|
132
|
+
module Spree
|
133
|
+
module TestingSupport
|
134
|
+
module Flash
|
135
|
+
def assert_flash_success(flash)
|
136
|
+
flash = convert_flash(flash)
|
137
|
+
|
138
|
+
within(".alert-success") do
|
139
|
+
expect(page).to have_content(flash)
|
140
|
+
end
|
141
|
+
end
|
142
|
+
end
|
143
|
+
end
|
144
|
+
end
|
Binary file
|
@@ -0,0 +1 @@
|
|
1
|
+
edit
|
@@ -0,0 +1 @@
|
|
1
|
+
new
|
@@ -0,0 +1 @@
|
|
1
|
+
edit
|
@@ -0,0 +1 @@
|
|
1
|
+
new
|
data/spree_backend.gemspec
CHANGED
@@ -8,14 +8,14 @@ Gem::Specification.new do |s|
|
|
8
8
|
s.summary = 'backend e-commerce functionality for the Spree project.'
|
9
9
|
s.description = 'Required dependency for Spree'
|
10
10
|
|
11
|
-
s.required_ruby_version = '>= 2.2.
|
11
|
+
s.required_ruby_version = '>= 2.2.7'
|
12
12
|
|
13
13
|
s.author = 'Sean Schofield'
|
14
14
|
s.email = 'sean@spreecommerce.com'
|
15
15
|
s.homepage = 'https://spreecommerce.com'
|
16
16
|
s.license = 'BSD-3-Clause'
|
17
17
|
|
18
|
-
s.files = `git ls-files`.split("\n")
|
18
|
+
s.files = `git ls-files`.split("\n")
|
19
19
|
s.require_path = 'lib'
|
20
20
|
s.requirements << 'none'
|
21
21
|
|
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
|
|
23
23
|
s.add_dependency 'spree_core', s.version
|
24
24
|
|
25
25
|
s.add_dependency 'bootstrap-sass', '~> 3.3'
|
26
|
-
s.add_dependency 'jquery-rails', '~> 4.
|
27
|
-
s.add_dependency 'jquery-ui-rails', '~>
|
26
|
+
s.add_dependency 'jquery-rails', '~> 4.1'
|
27
|
+
s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
|
28
28
|
s.add_dependency 'select2-rails', '3.5.9.1' # 3.5.9.2 breaks several specs
|
29
29
|
end
|