diff --git a/.gitignore b/.gitignore
index b2c9314..62b6599 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ nbproject
*.swp
spec/dummy
Gemfile.lock
+coverage
diff --git a/.ruby-version b/.ruby-version
index b1b25a5..437459c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2.2
+2.5.0
diff --git a/Gemfile b/Gemfile
index 80c1889..a25604e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,8 @@ group :development, :test do
gem 'i18n-tasks', '~> 0.9' if branch == 'master'
end
+gem 'simplecov', require: false, group: :test
+
gem 'mysql2'
gem 'sqlite3'
gem 'pg'
diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb
deleted file mode 100644
index c772b9b..0000000
--- a/app/controllers/spree/admin/orders_controller_decorator.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-module SolidusShipwire
- module ShipwireController
- def self.prepended(base)
- base.before_action :load_shipwire_order, only: [:shipwire]
- end
-
- def shipwire
- order_to_shipwire
-
- respond_to do |format|
- format.html
- format.js
- end
- end
-
- private
-
- def order_to_shipwire
- @shipwire_data = @order.in_shipwire
- rescue ResponseException => e
- @error = e.response
- rescue RuntimeError => e
- @error = e.message
- end
-
- def load_shipwire_order
- load_order
- end
- end
-end
-
-Spree::Admin::OrdersController.prepend SolidusShipwire::ShipwireController
diff --git a/app/controllers/spree/admin/return_authorizations_controller_decorator.rb b/app/controllers/spree/admin/return_authorizations_controller_decorator.rb
deleted file mode 100644
index ad260e6..0000000
--- a/app/controllers/spree/admin/return_authorizations_controller_decorator.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module SolidusShipwire
- module ShipwireReturnAuthorizationsController
- def self.prepended(base)
- base.after_action :flash_message, only: [:create]
- end
-
- private
-
- def flash_message
- message = @return_authorization.errors.messages[:shipwire]
- return unless message
- flash[:error] = message
- end
- end
-end
-
-Spree::Admin::ReturnAuthorizationsController.prepend SolidusShipwire::ShipwireReturnAuthorizationsController
diff --git a/app/models/variant_decorator.rb b/app/models/variant_decorator.rb
index 57c7b50..90aa5d7 100644
--- a/app/models/variant_decorator.rb
+++ b/app/models/variant_decorator.rb
@@ -5,10 +5,6 @@ def self.prepended(base)
serializer: SolidusShipwire::VariantSerializer
end
- def update_stocks_from_shipwire
- Shipwire::Stock.new.list( sku: self.sku)
- end
-
Spree::Variant.prepend self
end
end
diff --git a/app/views/spree/admin/orders/_shipwire_data.html.erb b/app/views/spree/admin/orders/_shipwire_data.html.erb
deleted file mode 100644
index 9b27a54..0000000
--- a/app/views/spree/admin/orders/_shipwire_data.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/app/views/spree/admin/orders/_shipwire_error.html.erb b/app/views/spree/admin/orders/_shipwire_error.html.erb
deleted file mode 100644
index 19a2de9..0000000
--- a/app/views/spree/admin/orders/_shipwire_error.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% if @error.kind_of? String %>
- <%= @error %>
-<% elsif @error.kind_of?(Shipwire::Response) && @error.has_validation_errors? %>
- Validation error
-
- <% if @error.validation_errors.kind_of? Array %>
- <% @error.validation_errors.each do |value| %>
- - <%= value['message'] %>
- <% end %>
- <% else %>
- <% @error.validation_errors.each do |key, value| %>
- <% value['message'].each do |_k, message| %>
- - <%= key %> - <%= message.values.join(',') %>
- <% end %>
- <% end %>
- <% end %>
-
-<% end %>
diff --git a/app/views/spree/admin/orders/shipwire.html.erb b/app/views/spree/admin/orders/shipwire.html.erb
deleted file mode 100644
index 510c2b0..0000000
--- a/app/views/spree/admin/orders/shipwire.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<% content_for :page_actions do %>
- <% if can?(:fire, @order) %>
- <%= event_links %>
- <% end %>
- <% if can?(:resend, @order) && @order.completed? %>
- <%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %>
- <% end %>
- <% if can?(:admin, Spree::Order) %>
- <%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %>
- <% end %>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Shipwire' } %>
-
-
- <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-
-
-
-
-<%= javascript_tag do -%>
-$('#retry_shipwire').bind('ajax:beforeSend', function() {
- $('#errors').hide()
-});
-<% end %>
diff --git a/app/views/spree/admin/orders/shipwire.js.erb b/app/views/spree/admin/orders/shipwire.js.erb
deleted file mode 100644
index bca33a4..0000000
--- a/app/views/spree/admin/orders/shipwire.js.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @error.nil? %>
- $('#errors').hide()
- $('#shipwire_data').html("<%= escape_javascript(render partial: 'spree/admin/orders/shipwire_data', shipwire_data: @shipwire_data) %>")
-<% else %>
- $('#errors').show()
- $('#errors').html("<%= escape_javascript(render partial: 'spree/admin/orders/shipwire_error', error: @error) %>")
-<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 54b2e1d..900573f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,19 +1,7 @@
Spree::Core::Engine.routes.draw do
- # Add your extension routes here
-
- Spree::Core::Engine.routes.draw do
- namespace :admin do
- resources :orders, except: [:show] do
- member do
- get :shipwire
- end
- end
- end
-
- namespace :api, defaults: { format: 'json' } do
- resources :shipments do
- resources :rates, only: [:index], module: :shipwire
- end
+ namespace :api, defaults: { format: 'json' } do
+ resources :shipments do
+ resources :rates, only: [:index], module: :shipwire
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3adcdd9..5153abe 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,9 @@
# Configure Rails Environment
ENV['RAILS_ENV'] = 'test'
+require 'simplecov'
+SimpleCov.start 'rails'
+
begin
require File.expand_path('../dummy/config/environment', __FILE__)
rescue LoadError