rspec 3.4 (was 3.1)

This commit is contained in:
Jared Beck 2015-12-19 18:47:13 -05:00
parent dce2514c58
commit 02a634f966
4 changed files with 9 additions and 5 deletions

View File

@ -19,7 +19,7 @@ group :development, :test do
gem 'rack-test', '>= 0.6'
# RSpec testing
gem 'rspec-rails', '~> 3.1.0'
gem 'rspec-rails', '~> 3.4.0'
gem 'generator_spec'
# To do proper transactional testing with ActiveSupport::TestCase on MySQL

View File

@ -30,7 +30,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'railties', ['>= 3.0', '< 5.0']
s.add_development_dependency 'sinatra', '~> 1.0'
s.add_development_dependency 'rack-test', '>= 0.6'
s.add_development_dependency 'rspec-rails', '~> 3.1.0'
s.add_development_dependency 'rspec-rails', '~> 3.4.0'
s.add_development_dependency 'generator_spec'
s.add_development_dependency 'database_cleaner', '~> 1.2'
s.add_development_dependency 'pry-nav', '~> 0.2.4'

View File

@ -239,7 +239,9 @@ describe Widget, :type => :model do
context "error within block" do
it "should ensure that the whodunnit value still reverts to it's previous value" do
expect { widget.whodunnit(new_name) { raise } }.to raise_error
expect {
widget.whodunnit(new_name) { raise }
}.to raise_error(RuntimeError)
expect(PaperTrail.whodunnit).to eq(orig_name)
end
end

View File

@ -1,10 +1,11 @@
require 'rails_helper'
describe "PaperTrail RSpec Helper" do
describe PaperTrail do
context 'default' do
it 'should have versioning off by default' do
expect(PaperTrail).not_to be_enabled
end
it 'should turn versioning on in a `with_versioning` block' do
expect(PaperTrail).not_to be_enabled
with_versioning do
@ -16,7 +17,7 @@ describe "PaperTrail RSpec Helper" do
context "error within `with_versioning` block" do
it "should revert the value of `PaperTrail.enabled?` to it's previous state" do
expect(PaperTrail).not_to be_enabled
expect { with_versioning { raise } }.to raise_error
expect { with_versioning { raise } }.to raise_error(RuntimeError)
expect(PaperTrail).not_to be_enabled
end
end
@ -26,6 +27,7 @@ describe "PaperTrail RSpec Helper" do
it 'should have versioning on by default' do
expect(PaperTrail).to be_enabled
end
it 'should keep versioning on after a with_versioning block' do
expect(PaperTrail).to be_enabled
with_versioning do