From 749061d60a994e093b84dd0a1af2ffb008d3f6a0 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 8 Jan 2016 18:42:03 +1100 Subject: [PATCH] knapsack report generation --- .travis.yml | 13 +++++++------ Gemfile | 1 + Gemfile.lock | 7 +++++++ Rakefile | 2 ++ spec/spec_helper.rb | 6 ++++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 952804f011..5867e4e5fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,12 @@ env: - TZ="Australia/Melbourne" - TIMEZONE="Australia/Melbourne" matrix: - - TEST_CASES="./spec/features/admin" GITHUB_DEPLOY="true" - - TEST_CASES="./spec/features/consumer ./spec/serializers ./spec/performance" - - TEST_CASES="./spec/models" - - TEST_CASES="./spec/controllers ./spec/views ./spec/jobs" - - TEST_CASES="./spec/requests ./spec/helpers ./spec/mailers ./spec/lib" KARMA="true" + - TEST_CASES="./spec" +# - TEST_CASES="./spec/features/admin" GITHUB_DEPLOY="true" +# - TEST_CASES="./spec/features/consumer ./spec/serializers ./spec/performance" +# - TEST_CASES="./spec/models" +# - TEST_CASES="./spec/controllers ./spec/views ./spec/jobs" +# - TEST_CASES="./spec/requests ./spec/helpers ./spec/mailers ./spec/lib" KARMA="true" before_script: - cp config/database.travis.yml config/database.yml @@ -36,7 +37,7 @@ before_script: script: - '[ "$KARMA" = "true" ] && bundle exec rake karma:run || echo "Skipping karma run"' - - "bundle exec rspec $TEST_CASES" + - "KNAPSACK_GENERATE_REPORT=true bundle exec rspec $TEST_CASES" after_success: - > diff --git a/Gemfile b/Gemfile index 00fd2c8908..8230c6a15f 100644 --- a/Gemfile +++ b/Gemfile @@ -105,6 +105,7 @@ group :test, :development do gem 'json_spec' gem 'unicorn-rails' gem 'atomic' + gem 'knapsack' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index bbcbfde415..16a319f0ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -431,6 +431,9 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.9.3) + knapsack (1.5.1) + rake + timecop (>= 0.1.0) launchy (2.1.2) addressable (~> 2.3) letter_opener (1.0.0) @@ -684,6 +687,7 @@ DEPENDENCIES immigrant jquery-rails json_spec + knapsack letter_opener momentjs-rails newrelic_rpm @@ -726,3 +730,6 @@ DEPENDENCIES whenever wicked_pdf wkhtmltopdf-binary + +BUNDLED WITH + 1.10.6 diff --git a/Rakefile b/Rakefile index 699faf6e9d..9ed55e022e 100644 --- a/Rakefile +++ b/Rakefile @@ -5,3 +5,5 @@ require File.expand_path('../config/application', __FILE__) Openfoodnetwork::Application.load_tasks + +Knapsack.load_tasks if defined?(Knapsack) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 61552c528d..b398eba25c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,9 @@ +require 'knapsack' + +# CUSTOM_CONFIG_GOES_HERE + +Knapsack::Adapters::RSpecAdapter.bind + require 'rubygems' # Require pry when we're not inside Travis-CI