Upgraded rspec 2.14.2 to 2.99.0

This commit is contained in:
Al Snow
2016-03-19 18:33:01 -04:00
parent 91edc5f283
commit fb923baee4
13 changed files with 80 additions and 43 deletions
+6 -2
View File
@@ -1,10 +1,14 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'gemdiff'
#don't upgrade #don't upgrade
gem 'rails', '4.2.6' gem 'rails', '4.2.6'
ruby '2.3.0' ruby '2.3.0'
gem 'rake', '10.5.0' # LOCKED DOWN UNTIL MOVE TO RSPEC beta2.
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', github: 'rails/rails' # gem 'rails', github: 'rails/rails'
@@ -39,7 +43,7 @@ group :development, :test, :mysql do
gem 'capybara' gem 'capybara'
gem 'database_cleaner' gem 'database_cleaner'
gem 'poltergeist' gem 'poltergeist'
gem 'rspec-rails', '2.14.2' gem 'rspec-rails', '2.99.0' # LOCKED DOWN
gem 'test-unit' gem 'test-unit'
end end
@@ -72,7 +76,7 @@ gem 'jquery-rails'
# Pow related gem # Pow related gem
gem 'powder' gem 'powder'
gem 'aruba' gem 'aruba', '0.9.0.pre' # LOCKED DOWN
#gem 'minitest', '~> 4.0', :require=> "minitest/autorun" #gem 'minitest', '~> 4.0', :require=> "minitest/autorun"
#gem 'minitest' #gem 'minitest'
+44 -22
View File
@@ -38,10 +38,13 @@ GEM
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.4.0) addressable (2.4.0)
arel (6.0.3) arel (6.0.3)
aruba (0.7.4) aruba (0.9.0.pre)
childprocess (>= 0.3.6) childprocess (~> 0.5.6)
cucumber (>= 1.1.1) contracts (~> 0.9)
rspec-expectations (>= 2.7.0) cucumber (>= 1.3.19)
ffi (~> 1.9.10)
rspec-expectations (>= 2.99)
thor (~> 0.19)
bcrypt (3.1.11) bcrypt (3.1.11)
better_errors (2.1.1) better_errors (2.1.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
@@ -82,8 +85,9 @@ GEM
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.10.0)
concurrent-ruby (1.0.1) concurrent-ruby (1.0.1)
contracts (0.13.0)
crack (0.3.1) crack (0.3.1)
cucumber (2.3.2) cucumber (2.3.3)
builder (>= 2.1.2) builder (>= 2.1.2)
cucumber-core (~> 1.4.0) cucumber-core (~> 1.4.0)
cucumber-wire (~> 0.0.1) cucumber-wire (~> 0.0.1)
@@ -105,6 +109,8 @@ GEM
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.9.1) eventmachine (1.0.9.1)
execjs (2.6.0) execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10) ffi (1.9.10)
foreman (0.78.0) foreman (0.78.0)
thor (~> 0.19.1) thor (~> 0.19.1)
@@ -114,6 +120,10 @@ GEM
cucumber cucumber
nokogiri nokogiri
trollop trollop
gemdiff (1.0.1)
launchy (~> 2.4)
octokit (~> 4.0)
thor (~> 0.19)
gherkin (3.2.0) gherkin (3.2.0)
globalid (0.3.6) globalid (0.3.6)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
@@ -135,9 +145,10 @@ GEM
guard (~> 2.8) guard (~> 2.8)
guard-compat (~> 1.0) guard-compat (~> 1.0)
multi_json (~> 1.8) multi_json (~> 1.8)
guard-rspec (4.3.1) guard-rspec (4.6.4)
guard (~> 2.1) guard (~> 2.1)
rspec (>= 2.14, < 4.0) guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
guard-shell (0.7.1) guard-shell (0.7.1)
guard (>= 2.0.0) guard (>= 2.0.0)
guard-compat (~> 1.0) guard-compat (~> 1.0)
@@ -182,6 +193,7 @@ GEM
minitest (5.8.4) minitest (5.8.4)
multi_json (1.11.2) multi_json (1.11.2)
multi_test (0.1.2) multi_test (0.1.2)
multipart-post (2.0.0)
mysql2 (0.4.3) mysql2 (0.4.3)
nenv (0.3.0) nenv (0.3.0)
nokogiri (1.6.7.2) nokogiri (1.6.7.2)
@@ -189,6 +201,8 @@ GEM
notiffany (0.0.8) notiffany (0.0.8)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
poltergeist (1.9.0) poltergeist (1.9.0)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
@@ -235,27 +249,30 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.16.0) raindrops (0.16.0)
rake (11.1.1) rake (10.5.0)
rb-fsevent (0.9.7) rb-fsevent (0.9.7)
rb-inotify (0.9.7) rb-inotify (0.9.7)
ffi (>= 0.5.0) ffi (>= 0.5.0)
ref (2.0.0) ref (2.0.0)
rspec (2.14.1) rspec (2.99.0)
rspec-core (~> 2.14.0) rspec-core (~> 2.99.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 2.99.0)
rspec-core (2.14.8) rspec-collection_matchers (1.1.2)
rspec-expectations (2.14.5) rspec-expectations (>= 2.99.0.beta1)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6) rspec-mocks (2.99.4)
rspec-rails (2.14.2) rspec-rails (2.99.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0) activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 2.14.0) rspec-collection_matchers
rspec-expectations (~> 2.14.0) rspec-core (~> 2.99.0)
rspec-mocks (~> 2.14.0) rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
ruby2ruby (2.3.0) ruby2ruby (2.3.0)
ruby_parser (~> 3.1) ruby_parser (~> 3.1)
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
@@ -269,6 +286,9 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
sexp_processor (4.7.0) sexp_processor (4.7.0)
shellany (0.0.1) shellany (0.0.1)
simplecov (0.11.2) simplecov (0.11.2)
@@ -297,7 +317,7 @@ GEM
sqlite3 (1.3.11) sqlite3 (1.3.11)
temple (0.7.6) temple (0.7.6)
terminal-table (1.5.2) terminal-table (1.5.2)
test-unit (3.1.7) test-unit (3.1.8)
power_assert power_assert
therubyracer (0.12.2) therubyracer (0.12.2)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
@@ -333,7 +353,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
aruba aruba (= 0.9.0.pre)
bcrypt bcrypt
better_errors better_errors
binding_of_caller binding_of_caller
@@ -346,6 +366,7 @@ DEPENDENCIES
execjs execjs
foreman foreman
gauntlt gauntlt
gemdiff
guard-brakeman guard-brakeman
guard-livereload guard-livereload
guard-rspec guard-rspec
@@ -361,8 +382,9 @@ DEPENDENCIES
pry-rails pry-rails
rack-livereload rack-livereload
rails (= 4.2.6) rails (= 4.2.6)
rake (= 10.5.0)
rb-fsevent rb-fsevent
rspec-rails (= 2.14.2) rspec-rails (= 2.99.0)
sass-rails sass-rails
simplecov simplecov
sqlite3 sqlite3
+1 -1
View File
@@ -13,4 +13,4 @@
describe Api::V1::UsersHelper do describe Api::V1::UsersHelper do
pending "add some examples to (or delete) #{__FILE__}" pending "add some examples to (or delete) #{__FILE__}"
end end
=end =end
+1 -1
View File
@@ -13,4 +13,4 @@
describe PasswordResetsHelper do describe PasswordResetsHelper do
pending "add some examples to (or delete) #{__FILE__}" pending "add some examples to (or delete) #{__FILE__}"
end end
=end =end
+1 -1
View File
@@ -13,4 +13,4 @@
describe PayHelper do describe PayHelper do
pending "add some examples to (or delete) #{__FILE__}" pending "add some examples to (or delete) #{__FILE__}"
end end
=end =end
+2 -2
View File
@@ -11,7 +11,7 @@ describe User do
end end
it "can be instantiated" do it "can be instantiated" do
Benefits.new.should be_an_instance_of(Benefits) expect(Benefits.new).to be_an_instance_of(Benefits)
end end
it "name can be updated" do it "name can be updated" do
@@ -19,6 +19,6 @@ describe User do
user = User.all.first user = User.all.first
user.first_name = new_name user.first_name = new_name
user.save! user.save!
User.all.first.first_name.should == new_name expect(User.all.first.first_name).to eq(new_name)
end end
end end
+1 -1
View File
@@ -3,4 +3,4 @@
describe Pay do describe Pay do
pending "add some examples to (or delete) #{__FILE__}" pending "add some examples to (or delete) #{__FILE__}"
end end
=end =end
+5 -5
View File
@@ -11,20 +11,20 @@ describe User do
end end
it "can be instantiated" do it "can be instantiated" do
User.new.should be_an_instance_of(User) expect(User.new).to be_an_instance_of(User)
end end
it "should require a email" do it "should require a email" do
User.new(:email => "").should_not be_valid expect(User.new(:email => "")).not_to be_valid
end end
it "should require valid email" do it "should require valid email" do
User.new(:email => "@gmail.com").should_not be_valid expect(User.new(:email => "@gmail.com")).not_to be_valid
end end
it "should require unique email" do it "should require unique email" do
user = User.all.first user = User.all.first
User.new(:email => user.email).should_not be_valid expect(User.new(:email => user.email)).not_to be_valid
end end
it "name can be updated" do it "name can be updated" do
@@ -32,6 +32,6 @@ describe User do
user = User.all.first user = User.all.first
user.first_name = new_name user.first_name = new_name
user.save! user.save!
User.all.first.first_name.should == new_name expect(User.all.first.first_name).to eq(new_name)
end end
end end
+11
View File
@@ -51,6 +51,17 @@ RSpec.configure do |config|
config.after(:each) do config.after(:each) do
DatabaseCleaner.clean DatabaseCleaner.clean
end end
# rspec-rails 3 will no longer automatically infer an example group's spec type
# from the file location. You can explicitly opt-in to the feature using this
# config option.
# To explicitly tag specs without using automatic inference, set the `:type`
# metadata manually:
#
# describe ThingsController, :type => :controller do
# # Equivalent to being in spec/controllers
# end
config.infer_spec_type_from_file_location!
end end
Capybara.javascript_driver = :poltergeist Capybara.javascript_driver = :poltergeist
@@ -3,4 +3,4 @@
describe "password_resets/new.html.erb" do describe "password_resets/new.html.erb" do
pending "add some examples to (or delete) #{__FILE__}" pending "add some examples to (or delete) #{__FILE__}"
end end
=end =end
@@ -23,6 +23,6 @@ feature 'command injection' do
end end
click_on 'Start Upload' click_on 'Start Upload'
end end
pending(:if => verifying_fixed?) { File.exists?(legit_file).should be_false } pending(:if => verifying_fixed?) { File.exists?(legit_file).should be_falsey }
end end
end end
+3 -3
View File
@@ -7,7 +7,7 @@ feature 'mass assignment' do
end end
scenario 'attack one' do scenario 'attack one' do
@normal_user.admin.should be_false @normal_user.admin.should be_falsey
login(@normal_user) login(@normal_user)
@@ -17,7 +17,7 @@ feature 'mass assignment' do
:password_confirmation => @normal_user.clear_password}} :password_confirmation => @normal_user.clear_password}}
page.driver.put "/users/#{@normal_user.user_id}.json", params page.driver.put "/users/#{@normal_user.user_id}.json", params
pending(:if => verifying_fixed?) { @normal_user.reload.admin.should be_true } pending(:if => verifying_fixed?) { @normal_user.reload.admin.should be_truthy }
end end
scenario 'attack two' do scenario 'attack two' do
@@ -31,7 +31,7 @@ feature 'mass assignment' do
pending(:if => verifying_fixed?) { pending(:if => verifying_fixed?) {
User.last.email.should == 'hackety@h4x0rs.c0m' User.last.email.should == 'hackety@h4x0rs.c0m'
User.last.admin.should be_true User.last.admin.should be_truthy
} }
end end
end end
+2 -2
View File
@@ -8,7 +8,7 @@ feature 'sql injection' do
end end
scenario 'attack' do scenario 'attack' do
@admin_user.admin.should be_true @admin_user.admin.should be_truthy
login(@normal_user) login(@normal_user)
@@ -29,4 +29,4 @@ feature 'sql injection' do
@admin_user.admin.should == true @admin_user.admin.should == true
} }
end end
end end