summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-29 08:45:33 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-29 08:45:33 +0000
commitea6ebee4ab6a7f479f7d8894bbe1ae3fb6607136 (patch)
treed909d16332aa3b0e40051edc49be0ba8e0f70f7d
parent83d8d611e949135aeb09ff8cc93472644ef6ca98 (diff)
parent8183260414aaadfa32173632cb03708911487ac6 (diff)
downloadgitlab-ce-ea6ebee4ab6a7f479f7d8894bbe1ae3fb6607136.tar.gz
Merge branch 'rs-fuubar' into 'master'
Add Fuubar as the default RSpec formatter - Shows how many specs have been run, how many remaining - Estimates how long is left - Instantly shows failures - Looks awesome :sparkles: ![Screen_Shot_2015-06-26_at_1.00.47_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/da7c989e04237141d9adb4c4b5898359/Screen_Shot_2015-06-26_at_1.00.47_AM.png) See merge request !893
-rw-r--r--.rspec1
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock10
3 files changed, 11 insertions, 1 deletions
diff --git a/.rspec b/.rspec
index 4e1e0d2f722..35f4d7441e0 100644
--- a/.rspec
+++ b/.rspec
@@ -1 +1,2 @@
--color
+--format Fuubar
diff --git a/Gemfile b/Gemfile
index bda2fac1eec..353422c3ef6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -224,6 +224,7 @@ end
group :development, :test do
gem 'awesome_print'
gem 'byebug'
+ gem 'fuubar', '~> 2.0.0'
gem 'pry-rails'
gem 'coveralls', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d09fe9bf88..ad780647a1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -242,6 +242,9 @@ GEM
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.5)
+ fuubar (2.0.0)
+ rspec (~> 3.0)
+ ruby-progressbar (~> 1.4)
gemnasium-gitlab-service (0.2.6)
rugged (~> 0.21)
gemojione (2.0.0)
@@ -530,6 +533,10 @@ GEM
rqrcode (0.4.2)
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
+ rspec (3.3.0)
+ rspec-core (~> 3.3.0)
+ rspec-expectations (~> 3.3.0)
+ rspec-mocks (~> 3.3.0)
rspec-core (3.3.1)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.0)
@@ -763,6 +770,7 @@ DEPENDENCIES
fog (~> 1.25.0)
font-awesome-rails (~> 4.2)
foreman
+ fuubar (~> 2.0.0)
gemnasium-gitlab-service (~> 0.2)
github-markup
gitlab-flowdock-git-hook (~> 0.4.2)
@@ -861,4 +869,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.10.3
+ 1.10.4