From b007630bb143f41646b9a5915bf7cd2ce8f81ef6 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Wed, 23 Jul 2014 17:37:11 +0200 Subject: [PATCH] Add spec reporter for Jenkins --- .rspec_ci | 4 ++++ Gemfile | 1 + Gemfile.lock | 3 +++ Makefile | 3 +++ 4 files changed, 11 insertions(+) create mode 100644 .rspec_ci diff --git a/.rspec_ci b/.rspec_ci new file mode 100644 index 0000000000..5959404e05 --- /dev/null +++ b/.rspec_ci @@ -0,0 +1,4 @@ +--colour +--require ci/reporter/rake/rspec_loader +--format CI::Reporter::RSpec +--format documentation diff --git a/Gemfile b/Gemfile index 810870b3a6..9764c135a6 100644 --- a/Gemfile +++ b/Gemfile @@ -91,6 +91,7 @@ group :development, :test do gem 'selenium-webdriver', '>= 2.5.0' gem 'mocha', '0.10.5' + gem 'ci_reporter' gem 'debugger', '1.6.5' diff --git a/Gemfile.lock b/Gemfile.lock index 828ca91e7a..a9cdf55ba1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,8 @@ GEM childprocess (0.5.1) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.0) + ci_reporter (1.9.0) + builder (>= 2.1.2) coderay (1.0.9) coercible (0.2.0) backports (~> 3.0, >= 3.1.0) @@ -345,6 +347,7 @@ DEPENDENCIES builder (= 3.0.0) capybara (= 1.1.2) charlock_holmes (= 0.6.9.4) + ci_reporter compass (= 0.12.3) dbf (= 2.0.6) debugger (= 1.6.5) diff --git a/Makefile b/Makefile index 723d66bb07..4d9b78e619 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,9 @@ all: @echo "Try make check" prepare-test-db: +ifdef JENKINS_URL + cp .rspec_ci .rspec +endif # TODO skip this if db already exists ? bundle exec rake cartodb:test:prepare