spree_backend 3.0.10 → 3.1.0.rc1

data/spec/features/admin/store_credits_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe 'Store credits admin' do
+  stub_authorization!
+
+  let!(:admin_user) { create(:admin_user) }
+  let!(:store_credit) { create(:store_credit) }
+
+  before do
+    allow(Spree.user_class).to receive(:find_by).and_return(store_credit.user)
+  end
+
+  describe 'visiting the store credits page' do
+    before do
+      visit spree.admin_path
+      click_link 'Users'
+    end
+
+    it 'should be on the store credits page' do
+      click_link store_credit.user.email
+      click_link 'Store Credits'
+      expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
+
+      store_credit_table = page.find('table')
+      expect(store_credit_table.all('tr').count).to eq 1
+      expect(store_credit_table).to have_content(Spree::Money.new(store_credit.amount).to_s)
+      expect(store_credit_table).to have_content(Spree::Money.new(store_credit.amount_used).to_s)
+      expect(store_credit_table).to have_content(store_credit.category_name)
+      expect(store_credit_table).to have_content(store_credit.created_by_email)
+    end
+  end
+
+  describe 'creating store credit' do
+    before do
+      visit spree.admin_path
+      click_link 'Users'
+      click_link store_credit.user.email
+      click_link 'Store Credits'
+      allow_any_instance_of(Spree::Admin::StoreCreditsController).to receive(:try_spree_current_user).and_return(admin_user)
+    end
+
+    it 'should create store credit and associate it with the user' do
+      click_link 'Add Store Credit'
+      page.fill_in 'store_credit_amount', with: '102.00'
+      select 'Exchange', from: 'store_credit_category_id'
+      click_button 'Create'
+
+      expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
+      store_credit_table = page.find('table')
+      expect(store_credit_table.all('tr').count).to eq 2
+      expect(Spree::StoreCredit.count).to eq 2
+    end
+  end
+
+  describe 'updating store credit' do
+    let(:updated_amount) { '99.0' }
+
+    before do
+      visit spree.admin_path
+      click_link 'Users'
+      click_link store_credit.user.email
+      click_link 'Store Credits'
+      allow_any_instance_of(Spree::Admin::StoreCreditsController).to receive(:try_spree_current_user).and_return(admin_user)
+    end
+
+    it 'should create store credit and associate it with the user' do
+      click_link 'Edit'
+      page.fill_in 'store_credit_amount', with: updated_amount
+      click_button 'Update'
+
+      expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
+      store_credit_table = page.find('table')
+      expect(store_credit_table).to have_content(Spree::Money.new(updated_amount).to_s)
+      expect(store_credit.reload.amount.to_f).to eq updated_amount.to_f
+    end
+  end
+
+  describe 'non-existent user' do
+    before do
+      visit spree.admin_path
+      click_link 'Users'
+      click_link store_credit.user.email
+      store_credit.user.destroy
+      allow(Spree.user_class).to receive(:find_by).and_return(nil)
+      click_link 'Store Credits'
+      allow_any_instance_of(Spree::Admin::StoreCreditsController).to receive(:try_spree_current_user).and_return(admin_user)
+    end
+
+    it 'should display flash withe error' do
+      expect(page).to have_content(Spree.t(:user_not_found))
+    end
+  end
+end

data/spec/features/admin/users_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 
 describe 'Users', type: :feature do
+  include Spree::BaseHelper
   stub_authorization!
+  include Spree::Admin::BaseHelper
 
   let!(:country) { create(:country) }
   let!(:user_a) { create(:user_with_addresses, email: 'a@example.com') }
@@ -33,12 +35,12 @@ describe 'Users', type: :feature do
         expect(page).to have_content (order.total + order_2.total)
         expect(page).to have_content orders.count
         expect(page).to have_content (orders.sum(&:total) / orders.count)
-        expect(page).to have_content I18n.l(user_a.created_at.to_date)
+        expect(page).to have_content pretty_time(user_a.created_at)
       end
     end
 
     it 'can go back to the users list' do
-      expect(page).to have_link Spree.t(:back_to_users_list), href: spree.admin_users_path
+      expect(page).to have_link Spree.user_class.model_name.human, href: spree.admin_users_path
     end
 
     it 'can navigate to the account page' do
@@ -219,8 +221,8 @@ describe 'Users', type: :feature do
 
     context "completed_at" do
       it_behaves_like "a sortable attribute" do
-        let(:text_match_1) { I18n.l(order.completed_at.to_date) }
-        let(:text_match_2) { I18n.l(order_2.completed_at.to_date) }
+        let(:text_match_1) { order_time(order.completed_at) }
+        let(:text_match_2) { order_time(order_2.completed_at) }
         let(:table_id) { "listing_orders" }
         let(:sort_link) { "orders_completed_at_title" }
       end
@@ -250,8 +252,8 @@ describe 'Users', type: :feature do
 
     context "completed_at" do
       it_behaves_like "a sortable attribute" do
-        let(:text_match_1) { I18n.l(order.completed_at.to_date) }
-        let(:text_match_2) { I18n.l(order_2.completed_at.to_date) }
+        let(:text_match_1) { order_time(order.completed_at) }
+        let(:text_match_2) { order_time(order_2.completed_at) }
         let(:table_id) { "listing_items" }
         let(:sort_link) { "orders_completed_at_title" }
       end

data/spec/helpers/admin/base_helper_spec.rb

@@ -21,4 +21,10 @@ describe Spree::Admin::BaseHelper, :type => :helper do
       expect(plural_resource_name(resource_class)).to eq("Products")
     end
   end
+
+  context "#order_time" do
+    it "prints in a format" do
+      expect(order_time(DateTime.new(2016, 5, 6, 13, 33))).to eq "2016-05-06 1:33 PM"
+    end
+  end
 end

data/spec/routing/admin_path_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Spree
+  module Admin
+    RSpec.describe "AdminPath", type: :routing do
+      it "shoud route to admin by default" do
+        expect(spree.admin_path).to eq("/admin")
+      end
+
+      it "should route to the the configured path" do
+        Spree.admin_path = "/secret"
+        Rails.application.reload_routes!
+        expect(spree.admin_path).to eq("/secret")
+
+        # restore the path for other tests
+        Spree.admin_path = "/admin"
+        Rails.application.reload_routes!
+        expect(spree.admin_path).to eq("/admin")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -30,6 +30,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 require 'database_cleaner'
 require 'ffaker'
+require 'timeout'
 
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/factories'

data/spree_backend.gemspec

@@ -24,6 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'bootstrap-sass',  '~> 3.3'
   s.add_dependency 'jquery-rails',    '~> 4.1'
   s.add_dependency 'jquery-ui-rails', '~> 5.0'
-
   s.add_dependency 'select2-rails',   '3.5.9.1' # 3.5.9.2 breaks several specs
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.1.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - Gemfile
 - Rakefile
 - app/assets/images/admin/payment_banner.png
@@ -199,6 +198,7 @@ files:
 - app/controllers/spree/admin/resource_controller.rb
 - app/controllers/spree/admin/return_authorization_reasons_controller.rb
 - app/controllers/spree/admin/return_authorizations_controller.rb
+- app/controllers/spree/admin/return_index_controller.rb
 - app/controllers/spree/admin/return_items_controller.rb
 - app/controllers/spree/admin/roles_controller.rb
 - app/controllers/spree/admin/root_controller.rb
@@ -211,6 +211,8 @@ files:
 - app/controllers/spree/admin/stock_locations_controller.rb
 - app/controllers/spree/admin/stock_movements_controller.rb
 - app/controllers/spree/admin/stock_transfers_controller.rb
+- app/controllers/spree/admin/store_credit_categories_controller.rb
+- app/controllers/spree/admin/store_credits_controller.rb
 - app/controllers/spree/admin/tax_categories_controller.rb
 - app/controllers/spree/admin/tax_rates_controller.rb
 - app/controllers/spree/admin/taxonomies_controller.rb
@@ -281,6 +283,7 @@ files:
 - app/views/spree/admin/orders/_line_item.html.erb
 - app/views/spree/admin/orders/_line_items.html.erb
 - app/views/spree/admin/orders/_line_items_edit_form.html.erb
+- app/views/spree/admin/orders/_order_actions.html.erb
 - app/views/spree/admin/orders/_risk_analysis.html.erb
 - app/views/spree/admin/orders/_shipment.html.erb
 - app/views/spree/admin/orders/_shipment_manifest.html.erb
@@ -301,8 +304,10 @@ files:
 - app/views/spree/admin/payments/new.html.erb
 - app/views/spree/admin/payments/show.html.erb
 - app/views/spree/admin/payments/source_forms/_gateway.html.erb
+- app/views/spree/admin/payments/source_forms/_storecredit.html.erb
 - app/views/spree/admin/payments/source_views/_check.html.erb
 - app/views/spree/admin/payments/source_views/_gateway.html.erb
+- app/views/spree/admin/payments/source_views/_storecredit.html.erb
 - app/views/spree/admin/product_properties/_product_property_fields.html.erb
 - app/views/spree/admin/product_properties/index.html.erb
 - app/views/spree/admin/products/_add_stock_form.html.erb
@@ -353,6 +358,7 @@ files:
 - app/views/spree/admin/prototypes/new.html.erb
 - app/views/spree/admin/prototypes/select.js.erb
 - app/views/spree/admin/prototypes/show.html.erb
+- app/views/spree/admin/refund_reasons/destroy.js.erb
 - app/views/spree/admin/refund_reasons/edit.html.erb
 - app/views/spree/admin/refund_reasons/index.html.erb
 - app/views/spree/admin/refund_reasons/new.html.erb
@@ -364,6 +370,7 @@ files:
 - app/views/spree/admin/reimbursements/show.html.erb
 - app/views/spree/admin/reports/index.html.erb
 - app/views/spree/admin/reports/sales_total.html.erb
+- app/views/spree/admin/return_authorization_reasons/destroy.js.erb
 - app/views/spree/admin/return_authorization_reasons/edit.html.erb
 - app/views/spree/admin/return_authorization_reasons/index.html.erb
 - app/views/spree/admin/return_authorization_reasons/new.html.erb
@@ -371,6 +378,8 @@ files:
 - app/views/spree/admin/return_authorizations/edit.html.erb
 - app/views/spree/admin/return_authorizations/index.html.erb
 - app/views/spree/admin/return_authorizations/new.html.erb
+- app/views/spree/admin/return_index/customer_returns.html.erb
+- app/views/spree/admin/return_index/return_authorizations.html.erb
 - app/views/spree/admin/roles/_form.html.erb
 - app/views/spree/admin/roles/edit.html.erb
 - app/views/spree/admin/roles/index.html.erb
@@ -405,6 +414,7 @@ files:
 - app/views/spree/admin/shared/sub_menu/_configuration.html.erb
 - app/views/spree/admin/shared/sub_menu/_product.html.erb
 - app/views/spree/admin/shared/sub_menu/_promotion.html.erb
+- app/views/spree/admin/shared/sub_menu/_returns.html.erb
 - app/views/spree/admin/shipping_categories/_form.html.erb
 - app/views/spree/admin/shipping_categories/edit.html.erb
 - app/views/spree/admin/shipping_categories/index.html.erb
@@ -434,6 +444,14 @@ files:
 - app/views/spree/admin/stock_transfers/index.html.erb
 - app/views/spree/admin/stock_transfers/new.html.erb
 - app/views/spree/admin/stock_transfers/show.html.erb
+- app/views/spree/admin/store_credit_categories/_form.html.erb
+- app/views/spree/admin/store_credit_categories/edit.html.erb
+- app/views/spree/admin/store_credit_categories/index.html.erb
+- app/views/spree/admin/store_credit_categories/new.html.erb
+- app/views/spree/admin/store_credits/_form.html.erb
+- app/views/spree/admin/store_credits/edit.html.erb
+- app/views/spree/admin/store_credits/index.html.erb
+- app/views/spree/admin/store_credits/new.html.erb
 - app/views/spree/admin/tax_categories/_form.html.erb
 - app/views/spree/admin/tax_categories/edit.html.erb
 - app/views/spree/admin/tax_categories/index.html.erb
@@ -511,6 +529,7 @@ files:
 - spec/controllers/spree/admin/reports_controller_spec.rb
 - spec/controllers/spree/admin/resource_controller_spec.rb
 - spec/controllers/spree/admin/return_authorizations_controller_spec.rb
+- spec/controllers/spree/admin/return_index_controller_spec.rb
 - spec/controllers/spree/admin/return_items_controller_spec.rb
 - spec/controllers/spree/admin/root_controller_spec.rb
 - spec/controllers/spree/admin/search_controller_spec.rb
@@ -529,6 +548,7 @@ files:
 - spec/features/admin/configuration/shipping_methods_spec.rb
 - spec/features/admin/configuration/states_spec.rb
 - spec/features/admin/configuration/stock_locations_spec.rb
+- spec/features/admin/configuration/store_credit_categories_spec.rb
 - spec/features/admin/configuration/tax_categories_spec.rb
 - spec/features/admin/configuration/tax_rates_spec.rb
 - spec/features/admin/configuration/zones_spec.rb
@@ -561,8 +581,13 @@ files:
 - spec/features/admin/promotions/adjustments_spec.rb
 - spec/features/admin/promotions/option_value_rule_spec.rb
 - spec/features/admin/promotions/tiered_calculator_spec.rb
+- spec/features/admin/refund_reasons/refund_reasons_spec.rb
 - spec/features/admin/reports_spec.rb
+- spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb
+- spec/features/admin/returns/customer_returns_spec.rb
+- spec/features/admin/returns/return_authorizations_spec.rb
 - spec/features/admin/stock_transfer_spec.rb
+- spec/features/admin/store_credits_spec.rb
 - spec/features/admin/taxons_spec.rb
 - spec/features/admin/users_spec.rb
 - spec/helpers/admin/base_helper_spec.rb
@@ -570,6 +595,7 @@ files:
 - spec/helpers/admin/stock_movements_helper_spec.rb
 - spec/helpers/promotion_rules_helper_spec.rb
 - spec/models/spree/resource_spec.rb
+- spec/routing/admin_path_spec.rb
 - spec/spec_helper.rb
 - spec/support/appear_before_matcher.rb
 - spec/support/ror_ringer.jpeg
@@ -617,13 +643,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.

data/CHANGELOG.md

@@ -1 +0,0 @@
-## Spree 2.4.0 (unreleased) ##