Skip to content

Commit

Permalink
Upgrade RSpec to v3.4
Browse files Browse the repository at this point in the history 
v3.3 introduced a new feature: the ability to re-run failed specs. v3.4
contains some other nifty features, such as code highlighting and
compound failure messages.
  • Loading branch information
@mcmire
mcmire committed Dec 31, 2015
1 parent 6b32531 commit 97a627c
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 82 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ build
doc
pkg
source
spec/examples.txt
tmp
25 changes: 14 additions & 11 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ GEM
yajl-ruby (~> 1.1.0)
rake (10.4.2)
redcarpet (3.0.0)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
slop (3.6.0)
thor (0.19.1)
yajl-ruby (1.1.0)
Expand All @@ -65,3 +65,6 @@ DEPENDENCIES
rspec (~> 3.2)
yard
zeus

BUNDLED WITH
1.11.1
37 changes: 20 additions & 17 deletions gemfiles/4.0.0.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,27 +118,27 @@ GEM
rake (10.4.2)
rdoc (4.2.0)
redcarpet (3.3.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
Expand Down Expand Up @@ -171,7 +171,7 @@ GEM
polyglot (>= 0.3.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (0.3.44)
tzinfo (0.3.46)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand Down Expand Up @@ -218,3 +218,6 @@ DEPENDENCIES
uglifier (>= 1.3.0)
yard
zeus

BUNDLED WITH
1.11.1
37 changes: 20 additions & 17 deletions gemfiles/4.0.1.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,27 +120,27 @@ GEM
rake (10.4.2)
rdoc (4.2.0)
redcarpet (3.3.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
Expand Down Expand Up @@ -173,7 +173,7 @@ GEM
polyglot (>= 0.3.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (0.3.44)
tzinfo (0.3.46)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand Down Expand Up @@ -220,3 +220,6 @@ DEPENDENCIES
uglifier (>= 1.3.0)
yard
zeus

BUNDLED WITH
1.11.1
37 changes: 20 additions & 17 deletions gemfiles/4.1.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.2)
minitest (5.8.1)
minitest (5.8.3)
minitest-reporters (1.1.2)
ansi
builder
Expand Down Expand Up @@ -116,27 +116,27 @@ GEM
rake (10.4.2)
rdoc (4.2.0)
redcarpet (3.3.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
ruby-progressbar (1.7.5)
sass (3.2.19)
sass-rails (4.0.5)
Expand Down Expand Up @@ -215,3 +215,6 @@ DEPENDENCIES
uglifier (>= 1.3.0)
yard
zeus

BUNDLED WITH
1.11.1
43 changes: 23 additions & 20 deletions gemfiles/4.2.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.1)
mini_portile2 (2.0.0)
minitest (5.8.3)
minitest-reporters (1.1.2)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.3)
posix-spawn (0.3.11)
protected_attributes (1.0.9)
Expand Down Expand Up @@ -141,27 +141,27 @@ GEM
rake (10.4.2)
rdoc (4.2.0)
redcarpet (3.3.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
ruby-progressbar (1.7.5)
sass (3.4.18)
sass-rails (5.0.4)
Expand Down Expand Up @@ -238,3 +238,6 @@ DEPENDENCIES
uglifier (>= 1.3.0)
yard
zeus

BUNDLED WITH
1.11.1
2 changes: 2 additions & 0 deletions spec/unit_spec_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
config.infer_spec_type_from_file_location!
end

config.example_status_persistence_file_path = "spec/examples.txt"

config.before(:all, type: :controller) do
self.class.controller(ApplicationController) { }
end
Expand Down

0 comments on commit 97a627c

Please sign in to comment.