spree_msrp 2.1.7 → 2.2.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a7db34e4148901f3dffa7490a0d88b6bdd0d8057
4
- data.tar.gz: f87cc0189b17db31a42922cfbe7767c1bfa707e8
3
+ metadata.gz: 2ba2647076f4e270cf2683a992f6df8db32d2860
4
+ data.tar.gz: 2cd468b06a4688788819911afd41e8157c1175a4
5
5
  SHA512:
6
- metadata.gz: 92939e302a186dbdb584af90839e4106306e58da251a699514caa2000258e530f94011d876a9c6fe9f558fd3ace106e8856f32e3aa3315d1ce6a175cab64c6db
7
- data.tar.gz: fbf659245c1efc346edff579b16d34dda243c15bf95e46eda1a8b5d935100c9746c39a2cb4e1f7f71bfec05a69376f92d13cb86e9518c850ed1738686abfa963
6
+ metadata.gz: a0a3d8944fc00636c8cab5152c48baf1968d8d23e18500c823050125012f6074059a057b8ecbd26a032b40625923e12e3162798672a808124327e55f962f9c30
7
+ data.tar.gz: 4229621b8be1ca5b6de8cd18885749f7b8347c07a98bfb7fb1578c3168d5f651ea4baa7764b1f2e8afc533d248bedec692250a18bcd55db5d3e01cd4e98f07de
data/Gemfile CHANGED
@@ -1,6 +1,7 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
+ gem 'spree', github: 'spree/spree', branch: '2-2-stable'
3
4
  # Provides basic authentication functionality for testing parts of your engine
4
- gem 'spree_auth_devise', github: 'spree/spree_auth_devise', :branch => '2-1-stable'
5
+ gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
5
6
 
6
7
  gemspec
data/Rakefile CHANGED
@@ -6,7 +6,13 @@ require 'spree/testing_support/extension_rake'
6
6
 
7
7
  RSpec::Core::RakeTask.new
8
8
 
9
- task :default => [:spec]
9
+ task :default do
10
+ if Dir["spec/dummy"].empty?
11
+ Rake::Task[:test_app].invoke
12
+ Dir.chdir("../../")
13
+ end
14
+ Rake::Task[:spec].invoke
15
+ end
10
16
 
11
17
  desc 'Generates a dummy app for testing'
12
18
  task :test_app do
@@ -5,13 +5,13 @@ module SpreeMsrp
5
5
  class_option :auto_run_migrations, :type => :boolean, :default => false
6
6
 
7
7
  def add_javascripts
8
- append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_msrp\n"
9
- append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_msrp\n"
8
+ append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_msrp\n"
9
+ append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_msrp\n"
10
10
  end
11
11
 
12
12
  def add_stylesheets
13
- inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_msrp\n", :before => /\*\//, :verbose => true
14
- inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_msrp\n", :before => /\*\//, :verbose => true
13
+ inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_msrp\n", :before => /\*\//, :verbose => true
14
+ inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_msrp\n", :before => /\*\//, :verbose => true
15
15
  end
16
16
 
17
17
  def add_migrations
@@ -4,8 +4,6 @@ module SpreeMsrp
4
4
  isolate_namespace Spree
5
5
  engine_name 'spree_msrp'
6
6
 
7
- config.autoload_paths += %W(#{config.root}/lib)
8
-
9
7
  # use rspec for tests
10
8
  config.generators do |g|
11
9
  g.test_framework :rspec
data/spec/spec_helper.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'pry'
2
+
1
3
  # Run Coverage report
2
4
  require 'simplecov'
3
5
  SimpleCov.start do
@@ -23,10 +25,11 @@ require 'ffaker'
23
25
  # in spec/support/ and its subdirectories.
24
26
  Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
25
27
 
26
- # Requires factories defined in spree_core
27
- require 'spree/testing_support/factories'
28
- require 'spree/testing_support/controller_requests'
28
+ # Requires factories and other useful helpers defined in spree_core.
29
29
  require 'spree/testing_support/authorization_helpers'
30
+ require 'spree/testing_support/capybara_ext'
31
+ require 'spree/testing_support/controller_requests'
32
+ require 'spree/testing_support/factories'
30
33
  require 'spree/testing_support/url_helpers'
31
34
 
32
35
  # Requires factories defined in lib/spree_msrp/factories.rb
@@ -79,4 +82,5 @@ RSpec.configure do |config|
79
82
  end
80
83
 
81
84
  config.fail_fast = ENV['FAIL_FAST'] || false
85
+ config.order = "random"
82
86
  end
data/spree_msrp.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |s|
3
3
  s.platform = Gem::Platform::RUBY
4
4
  s.name = 'spree_msrp'
5
- s.version = '2.1.7'
5
+ s.version = '2.2.4'
6
6
  s.summary = 'Add MSRP to Spree products'
7
7
  s.description = 'Add MSRP to Spree products'
8
8
  s.required_ruby_version = '>= 1.9.3'
@@ -16,15 +16,15 @@ Gem::Specification.new do |s|
16
16
  s.require_path = 'lib'
17
17
  s.requirements << 'none'
18
18
 
19
- s.add_dependency 'spree_core', '~> 2.1.7'
19
+ s.add_dependency 'spree_core', '~> 2.2.4'
20
20
 
21
21
  s.add_development_dependency 'capybara', '~> 2.1'
22
22
  s.add_development_dependency 'coffee-rails'
23
23
  s.add_development_dependency 'database_cleaner'
24
- s.add_development_dependency 'factory_girl', '~> 4.2'
24
+ s.add_development_dependency 'factory_girl', '~> 4.4'
25
25
  s.add_development_dependency 'ffaker'
26
26
  s.add_development_dependency 'rspec-rails', '~> 2.13'
27
- s.add_development_dependency 'sass-rails'
27
+ s.add_development_dependency 'sass-rails', '~> 4.0.2'
28
28
  s.add_development_dependency 'selenium-webdriver'
29
29
  s.add_development_dependency 'simplecov'
30
30
  s.add_development_dependency 'sqlite3'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_msrp
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.7
4
+ version: 2.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Colin Mattson
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.1.7
19
+ version: 2.2.4
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.1.7
26
+ version: 2.2.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: capybara
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '4.2'
75
+ version: '4.4'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '4.2'
82
+ version: '4.4'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: ffaker
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
112
112
  name: sass-rails
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '0'
117
+ version: 4.0.2
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '0'
124
+ version: 4.0.2
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: selenium-webdriver
127
127
  requirement: !ruby/object:Gem::Requirement
@@ -191,14 +191,10 @@ files:
191
191
  - README.md
192
192
  - Rakefile
193
193
  - Versionfile
194
- - app/assets/javascripts/admin/spree_msrp.js
195
194
  - app/assets/javascripts/spree/backend/spree_msrp.js
196
195
  - app/assets/javascripts/spree/frontend/spree_msrp.js
197
- - app/assets/javascripts/store/spree_msrp.js
198
- - app/assets/stylesheets/admin/spree_msrp.css
199
196
  - app/assets/stylesheets/spree/backend/spree_msrp.css
200
197
  - app/assets/stylesheets/spree/frontend/spree_msrp.css
201
- - app/assets/stylesheets/store/spree_msrp.css
202
198
  - app/models/spree/product_decorator.rb
203
199
  - app/overrides/add_msrp_to_product_edit.rb
204
200
  - app/overrides/add_msrp_to_variants_edit.rb
@@ -1 +0,0 @@
1
- //= require admin/spree_backend
@@ -1 +0,0 @@
1
- //= require store/spree_frontend
@@ -1,3 +0,0 @@
1
- /*
2
- *= require admin/spree_backend
3
- */
@@ -1,3 +0,0 @@
1
- /*
2
- *= require store/spree_frontend
3
- */