spree_backend 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cebe3e7299845641b73d9070be94f428951ab670
-  data.tar.gz: 4e5ec2d0d25cb341c0096b54273f5463ce1fa434
+  metadata.gz: 1e89bc11718ae758bfc03f3a40315797c0e08998
+  data.tar.gz: 704ba4903c533b4b53fd3c2669394cd70e2b0018
 SHA512:
-  metadata.gz: c8d848cf38a22b7ee82476b0fb552035439987a1219e3447850fdfb6d18ac2df147302e1cb6cad98b0d538620e98020136505dbe387ecc055159d74d2a0607b0
-  data.tar.gz: ccb8dd70ac73d53bef5a00e541581391d85f4fb5c9b0e9c1154e193f24cc7c0000605482e175467b13c1370793a38b02417e9f40766aa358c78b4d03f6cb5045
+  metadata.gz: ed6f33fbb8928ca2c9e1bc31a1214fe213f9b4a72b82fe6a08f866d1a7b235f367bf9493ead00b004f0dd8784014cb83d94f48df176177149b61e5d1a0abba93
+  data.tar.gz: 1ce4af7c955243d0f8cd983e0887c935b504b0ecc4d8a0efb20893318970ae8ff85508efe3e7602285ec6fe51d1eb960fec6244d54e150554d01af3dc6d0a6e4

data/CHANGELOG.md

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

data/Gemfile

@@ -0,0 +1,6 @@
+eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+
+gem 'spree_core', path: '../core'
+gem 'spree_api', path: '../api'
+
+gemspec

data/Rakefile

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/packagetask'
+require 'rubygems/package_task'
+require 'rspec/core/rake_task'
+require 'spree/testing_support/common_rake'
+
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new
+
+spec = eval(File.read('spree_backend.gemspec'))
+Gem::PackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
+
+desc "Release to gemcutter"
+task :release do
+  version = File.read(File.expand_path("../../SPREE_VERSION", __FILE__)).strip
+  cmd = "cd pkg && gem push spree_backend-#{version}.gem"; puts cmd; system cmd
+end
+
+task :default => :spec
+
+desc "Generates a dummy app for testing"
+task :test_app do
+  ENV['LIB_NAME'] = 'spree/backend'
+  Rake::Task['common:test_app'].invoke
+end

data/app/assets/javascripts/spree/backend/admin.js

@@ -149,6 +149,32 @@ jQuery(function($) {
     }
   });
 
+  // per page dropdown
+  // preserves all selected filters / queries supplied by user
+  // changes only per_page value
+  $(".js-per-page-select").change(function() {
+    var form  = $(this).closest(".js-per-page-form");
+    var url   = form.attr('action');
+    var value = $(this).val().toString();
+    if (url.match(/\?/)) {
+      url += "&per_page=" + value;
+    } else {
+      url += "?per_page=" + value;
+    }
+    window.location = url;
+  });
+
+  // injects per_page settings to all available search forms
+  // so when user changes some filters / queries per_page is preserved
+  $(document).ready(function() {
+    var perPageDropdown = $(".js-per-page-select:first");
+    if (perPageDropdown.length) {
+      var perPageValue = perPageDropdown.val().toString();
+      var perPageInput = '<input type="hidden" name="per_page" value=' + perPageValue + ' />';
+      $("#table-filter form").append(perPageInput);
+    }
+  });
+
   // Enable sidebar toggle
   $("[data-toggle='offcanvas']").click(function(e) {
     e.preventDefault();

data/app/controllers/spree/admin/resource_controller.rb

@@ -30,9 +30,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     invoke_callbacks(:update, :before)
     if @object.update_attributes(permitted_resource_params)
       invoke_callbacks(:update, :after)
-      flash[:success] = flash_message_for(@object, :successfully_updated)
       respond_with(@object) do |format|
-        format.html { redirect_to location_after_save }
+        format.html do
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+          redirect_to location_after_save
+        end
         format.js { render layout: false }
       end
     else

data/app/helpers/spree/admin/navigation_helper.rb

@@ -87,7 +87,16 @@ module Spree
 
         select_tag(:per_page,
           options_for_select(per_page_options, params['per_page'] || per_page_default),
-          { id: "js-per-page-select", class: "form-control pull-right" })
+          { class: "form-control pull-right js-per-page-select" })
+      end
+
+      # helper method to create proper url to apply per page filtering
+      # fixes https://github.com/spree/spree/issues/6888
+      def per_page_dropdown_params
+        args = params.clone
+        args.delete(:page)
+        args.delete(:per_page)
+        args
       end
 
       # finds class for a given symbol / string

data/app/views/spree/admin/images/new.html.erb

@@ -11,7 +11,7 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'save' %>
+      <%= button Spree.t('actions.create'), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
       <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), icon: 'delete', id: 'cancel_link' %>
     </div>

data/app/views/spree/admin/payments/_list.html.erb

@@ -28,7 +28,7 @@
             <% if action == 'credit' %>
               <%= link_to_with_icon('refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-default btn-sm") if can?(:create, Spree::Refund) %>
             <% else %>
-              <%= link_to_with_icon(action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-default btn-sm") if can?(action, payment) %>
+              <%= link_to_with_icon(action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-default btn-sm") if can?(action.to_sym, payment) %>
             <% end %>
           <% end %>
         </td>

data/app/views/spree/admin/products/_form.html.erb

@@ -92,7 +92,7 @@
 
         <div data-hook="admin_product_form_promotionable">
           <%= f.field_container :promotionable, class: ['form-group'] do %>
-              <%= f.label :promotionable %>
+              <%= f.label :promotionable, Spree.t(:promotionable) %>
               <%= f.error_message_on :promotionable %>
               <%= f.check_box :promotionable, class: 'form-control' %>
           <% end %>

data/app/views/spree/admin/shared/_index_table_options.html.erb

@@ -4,20 +4,10 @@
   </div>
   <div class="col-sm-6">
     <div class="pagination-wrap">
-      <%= form_tag({ :action => "index"}, { :method => "get", :id => "js-per-page-form", :class => 'form-inline' }) do %>
+      <%= form_tag(per_page_dropdown_params, { method: :get, class: 'js-per-page-form form-inline' }) do %>
         <%= per_page_dropdown %>
       <% end %>
       <div class="clearfix"></div>
     </div>
   </div>
 </div>
-
-<% content_for :head do %>
-  <%= javascript_tag do %>
-    $(document).ready(function() {
-      $("#js-per-page-select").change(function() {
-        $("#js-per-page-form").submit();
-      });
-    });
-  <% end %>
-<% end %>

data/app/views/spree/admin/shared/sub_menu/_product.html.erb

@@ -1,5 +1,5 @@
 <ul id="sidebar-product" class="collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
-  <%= tab *Spree::BackendConfiguration::PRODUCT_TABS %>
+  <%= tab :products %>
   <%= tab :option_types, :match_path => '/option_types' %>
   <%= tab :properties %>
   <%= tab :prototypes %>

data/script/rails

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree/backend/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
+

data/spec/controllers/spree/admin/base_controller_spec.rb

@@ -0,0 +1,46 @@
+# Spree's rpsec controller tests get the Spree::ControllerHacks
+# we don't need those for the anonymous controller here, so
+# we call process directly instead of get
+require 'spec_helper'
+
+describe Spree::Admin::BaseController, type: :controller do
+  controller(Spree::Admin::BaseController) do
+    def index
+      authorize! :update, Spree::Order
+      render text: 'test'
+    end
+  end
+
+  context "unauthorized request" do
+    before do
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+    end
+
+    it "redirects to root" do
+      allow(controller).to receive_message_chain(:spree, :root_path).and_return('/root')
+      get :index
+      expect(response).to redirect_to '/root'
+    end
+  end
+
+  context "#generate_api_key" do
+    let(:user) { mock_model(Spree.user_class, has_spree_role?: true) }
+
+    before do
+      allow(controller).to receive(:authorize_admin) { true }
+      allow(controller).to receive(:try_spree_current_user) { user }
+    end
+
+    it "generates the API key for a user when they visit" do
+      expect(user).to receive(:spree_api_key).and_return(nil)
+      expect(user).to receive(:generate_spree_api_key!)
+      get :index
+    end
+
+    it "does not attempt to regenerate the API key if the key is already set" do
+      expect(user).to receive(:spree_api_key).and_return('fake')
+      expect(user).not_to receive(:generate_spree_api_key!)
+      get :index
+    end
+  end
+end

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -0,0 +1,185 @@
+require 'spec_helper'
+
+module Spree
+  module Admin
+    describe CustomerReturnsController, :type => :controller do
+      stub_authorization!
+
+      describe "#index" do
+        let(:order)           { customer_return.order }
+        let(:customer_return) { create(:customer_return) }
+
+        subject do
+          spree_get :index, { order_id: customer_return.order.to_param }
+        end
+
+        before { subject }
+
+        it "loads the order" do
+          expect(assigns(:order)).to eq order
+        end
+
+        it "loads the customer return" do
+          expect(assigns(:customer_returns)).to include(customer_return)
+        end
+      end
+
+      describe "#new" do
+        let(:order) { create(:shipped_order, line_items_count: 1) }
+        let!(:rma) { create :return_authorization, order: order, return_items: [create(:return_item, inventory_unit: order.inventory_units.first)] }
+        let!(:inactive_reimbursement_type)      { create(:reimbursement_type, active: false) }
+        let!(:first_active_reimbursement_type)  { create(:reimbursement_type) }
+        let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
+
+        subject do
+          spree_get :new, { order_id: order.to_param }
+        end
+
+        it "loads the order" do
+          subject
+          expect(assigns(:order)).to eq order
+        end
+
+        it "creates a new customer return" do
+          subject
+          expect(assigns(:customer_return)).to_not be_persisted
+        end
+
+        context "with previous customer return" do
+          let(:order) { create(:shipped_order, line_items_count: 4) }
+          let(:rma) { create(:return_authorization, order: order) }
+
+          let!(:rma_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.first) }
+          let!(:customer_return_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.last) }
+
+          context "there is a return item associated with an rma but not a customer return" do
+            let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [customer_return_return_item]) }
+
+            before do
+              subject
+            end
+
+            it "loads the persisted rma return items" do
+              expect(assigns(:rma_return_items).all? { |return_item| return_item.persisted? }).to eq true
+            end
+
+            it "has one rma return item" do
+              expect(assigns(:rma_return_items)).to include(rma_return_item)
+            end
+          end
+        end
+      end
+
+      describe "#edit" do
+        let(:order)           { customer_return.order }
+        let(:customer_return) { create(:customer_return, line_items_count: 3) }
+
+        let!(:accepted_return_item)            { customer_return.return_items.order('id').first.tap(&:accept!) }
+        let!(:rejected_return_item)            { customer_return.return_items.order('id').second.tap(&:reject!)}
+        let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
+
+        subject do
+          spree_get :edit, { order_id: order.to_param, id: customer_return.to_param }
+        end
+
+        before do
+          subject
+        end
+
+        it "loads the order" do
+          expect(assigns(:order)).to eq order
+        end
+
+        it "loads the customer return" do
+          expect(assigns(:customer_return)).to eq customer_return
+        end
+
+        it "loads the accepted return items" do
+          expect(assigns(:accepted_return_items)).to eq [accepted_return_item]
+        end
+
+        it "loads the rejected return items" do
+          expect(assigns(:rejected_return_items)).to eq [rejected_return_item]
+        end
+
+        it "loads the return items that require manual intervention" do
+          expect(assigns(:manual_intervention_return_items)).to eq [manual_intervention_return_item]
+        end
+
+        it "loads the return items that are still pending" do
+          expect(assigns(:pending_return_items)).to eq []
+        end
+
+        it "loads the reimbursements that are still pending" do
+          expect(assigns(:pending_reimbursements)).to eq []
+        end
+      end
+
+      describe "#create" do
+        let(:order) { create(:shipped_order, line_items_count: 1) }
+        let!(:return_authorization) { create :return_authorization, order: order, return_items: [create(:return_item, inventory_unit: order.inventory_units.shipped.last)] }
+
+        subject do
+          spree_post :create, customer_return_params
+        end
+
+        context "valid customer return" do
+          let(:stock_location) { order.shipments.last.stock_location }
+
+          let!(:customer_return_params) do
+            {
+              order_id: order.to_param,
+              customer_return: {
+                stock_location_id: stock_location.id,
+                return_items_attributes: {
+                  "0" => {
+                    id: return_authorization.return_items.first.id,
+                    returned: "1",
+                    "pre_tax_amount"=>"15.99",
+                    inventory_unit_id: order.inventory_units.shipped.last.id
+                  }
+                }
+              }
+            }
+          end
+
+          it "creates a customer return" do
+            expect{ subject }.to change { Spree::CustomerReturn.count }.by(1)
+          end
+
+          it "redirects to the index page" do
+            subject
+            expect(response).to redirect_to(spree.edit_admin_order_customer_return_path(order, assigns(:customer_return)))
+          end
+        end
+
+        context "invalid customer return" do
+          let!(:customer_return_params) do
+            {
+              order_id: order.to_param,
+              customer_return: {
+                stock_location_id: "",
+                return_items_attributes: {
+                  "0" => {
+                    returned: "1",
+                    "pre_tax_amount"=>"15.99",
+                    inventory_unit_id: order.inventory_units.shipped.last.id
+                  }
+                }
+              }
+            }
+          end
+
+          it "doesn't create a customer return" do
+            expect{ subject }.to_not change { Spree::CustomerReturn.count }
+          end
+
+          it "renders the new page" do
+            subject
+            expect(response).to render_template(:new)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/controllers/spree/admin/general_settings_controller_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Spree::Admin::GeneralSettingsController, type: :controller do
+  let(:user) { create(:user) }
+
+  before do
+    allow(controller).to receive_messages :spree_current_user => user
+    user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
+  end
+
+  describe '#clear_cache' do
+    subject { spree_post :clear_cache }
+
+    shared_examples 'a HTTP 204 response' do
+      it 'grant access to users with an admin role' do
+        subject
+        expect(response.status).to eq(204)
+      end
+    end
+
+    context 'when no callback' do
+      it_behaves_like 'a HTTP 204 response'
+    end
+
+    context 'when callback implemented' do
+      Spree::Admin::GeneralSettingsController.class_eval do
+        custom_callback(:clear_cache).after :foo
+
+        def foo
+          # Make a call to Akamai, CloudFlare, etc invalidation....
+        end
+      end
+
+      before do
+        expect(controller).to receive(:foo).once
+      end
+
+      it_behaves_like 'a HTTP 204 response'
+    end
+  end
+end