tests are passing

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
-# gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise"
+gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise", :branch => '2-1-stable'
 gem 'haml'
 
 gemspec

app/controllers/spree/admin/orders/delivery_options_controller.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    module Orders
+      class DeliveryOptionsController < Spree::Admin::BaseController
+
+        def edit
+          @order = Order.find_by(number: params[:order_id])
+        end
+
+      end
+    end
+  end
+end

app/overrides/add_delivery_options_link_order_page.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "spree/admin/shared/_order_tabs",
+                     :name => "add_delivery_info_to_order_details",
+                     :insert_bottom => "[data-hook='admin_order_tabs']",
+                     :partial => "spree/admin/shared/delivery_options_link",
+                     :disabled => false)

app/views/spree/admin/orders/delivery_options/edit.haml

@@ -0,0 +1,14 @@
+= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Delivery Options' }
+
+= csrf_meta_tags
+
+- content_for :page_title do
+  %i.icon-arrow-right= Spree.t(:delivery_options)
+
+- content_for :page_actions do
+  %li= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
+
+= render :partial => 'spree/shared/error_messages', :locals => { :target => @order }
+
+-# = form_for @order, :url => admin_order_customer_url(@order) do |f| %>
+-#   = render 'form', :f => f %>  

app/views/spree/admin/shared/_delivery_options_link.haml

@@ -0,0 +1,3 @@
+- if can? :update, @order && checkout_steps.include?("delivery") %>
+  %li(class="#{'active' if current == 'Delivery Options'}")
+    = link_to_with_icon 'icon-truck', Spree.t(:delivery_options), admin_order_delivery_options_url(@order)

config/routes.rb

@@ -1,3 +1,5 @@
 Spree::Core::Engine.routes.draw do
-  # Add your extension routes here
+
+  get "admin/orders/:order_id/delivery_options/", controller: 'admin/orders/delivery_options', action: 'edit', as: 'admin_order_delivery_options'
+
 end

lib/spree_delivery_options.rb

@@ -1,2 +1,4 @@
 require 'spree_core'
+require 'spree_frontend'
+require 'spree_backend'
 require 'spree_delivery_options/engine'

lib/spree_delivery_options/engine.rb

@@ -1,6 +1,7 @@
 module SpreeDeliveryOptions
   class Engine < Rails::Engine
     require 'spree/core'
+
     isolate_namespace Spree
 
     initializer "spree.spree_delivery_options.preferences", :after => "spree.environment" do |app|
@@ -17,7 +18,10 @@ class Engine < Rails::Engine
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/controllers/**/*.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
     end

spec/controllers/spree/admin/orders/delivery_options_controller_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Spree::Admin::Orders::DeliveryOptionsController do
+
+  let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
+
+  before :each do
+    controller.stub :spree_current_user => user
+    controller.stub :check_authorization
+  end
+
+  describe 'edit' do
+
+    it 'should render edit' do
+      spree_get :edit
+      response.should render_template(:edit)
+    end
+
+  end
+
+end

spec/spec_helper.rb

@@ -40,6 +40,7 @@
   # visit spree.admin_path
   # current_path.should eql(spree.products_path)
   config.include Spree::TestingSupport::UrlHelpers
+  config.include Spree::TestingSupport::ControllerRequests
 
   # == Mock Framework
   #