From e2d4fbd9ce09faf123480f4dcc093a1c27664891 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 1 Nov 2017 18:42:22 +0100 Subject: [PATCH] knapsack_pro setup --- .travis.yml | 8 ++++---- Gemfile | 2 +- Gemfile.lock | 8 +++----- Rakefile | 2 +- spec/spec_helper.rb | 5 +++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4eb86bbf6..cbdeee0b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ before_script: - bundle exec rake db:setup script: - "bundle exec rake assets:precompile RAILS_ENV=test" - - "bundle exec rake knapsack:rspec" + - "bundle exec rake knapsack_pro:rspec" env: global: - - CI_NODE_TOTAL=2 + - KNAPSACK_PRO_CI_NODE_TOTAL=2 matrix: - - CI_NODE_INDEX=0 - - CI_NODE_INDEX=1 + - KNAPSACK_PRO_CI_NODE_INDEX=0 + - KNAPSACK_PRO_CI_NODE_INDEX=1 diff --git a/Gemfile b/Gemfile index b0c7f2e9a..79383b48f 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ group :development, :test do gem 'factory_girl_rails', '~> 4.8.0' gem 'faker', '~> 1.7.3' gem 'i18n-tasks', '~> 0.9.15' - gem 'knapsack', '~> 1.13.3' + gem 'knapsack_pro', '~> 0.52.0' gem 'launchy', '~> 2.4.3' gem 'letter_opener_web', '~> 1.3.1' gem 'quiet_assets', '~> 1.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8bfbbb27c..3b30015e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,9 +229,8 @@ GEM kaminari-core (= 1.0.1) kaminari-core (1.0.1) kgio (2.11.0) - knapsack (1.13.3) + knapsack_pro (0.52.0) rake - timecop (>= 0.1.0) kramdown (1.14.0) launchy (2.4.3) addressable (~> 2.3) @@ -451,7 +450,6 @@ GEM thread (0.2.2) thread_safe (0.3.6) tilt (2.0.7) - timecop (0.9.1) tins (1.15.0) turbolinks (2.5.3) coffee-rails @@ -531,7 +529,7 @@ DEPENDENCIES jquery-rails (~> 4.3.1) jquery-ui-rails (~> 6.0.1) kaminari (~> 1.0.1) - knapsack (~> 1.13.3) + knapsack_pro (~> 0.52.0) launchy (~> 2.4.3) letter_opener_web (~> 1.3.1) mdl (~> 0.4.0) @@ -573,4 +571,4 @@ DEPENDENCIES whenever (~> 0.9.7) BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/Rakefile b/Rakefile index ef2c381ff..13a99536b 100644 --- a/Rakefile +++ b/Rakefile @@ -4,4 +4,4 @@ require File.expand_path('../config/application', __FILE__) Rails.application.load_tasks -Knapsack.load_tasks if defined?(Knapsack) \ No newline at end of file +KnapsackPro.load_tasks if defined?(KnapsackPro) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a0e4a98b0..7beab6ff1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,8 @@ require 'factory_girl_rails' require 'database_cleaner' require 'email_spec' require 'devise' -require 'knapsack' +require 'knapsack_pro' + Dir["./spec/models/concerns/*.rb"].each { |f| require f } Dir["./spec/support/**/*.rb"].sort.each { |f| require f } Dir["./spec/shared/**/*.rb"].sort.each { |f| require f } @@ -107,4 +108,4 @@ RSpec.configure do |config| end # Parallel build helper configuration for travis -Knapsack::Adapters::RSpecAdapter.bind +KnapsackPro::Adapters::RSpecAdapter.bind