From 263fa14a10eab408b1f9a9fbb749b7817b8b2ec6 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 10 Mar 2016 05:17:59 -0500 Subject: [PATCH 01/13] Upgraded jquery-rails gem; Locked down rake gem to 10.5.0 --- Gemfile | 1 + Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2fb0d73..a386989 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source 'https://rubygems.org' #don't upgrade gem 'rails', '4.2.6' +gem 'rake', '10.5.0' # LOCKED DOWN ruby '2.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 89cba7b..32c1636 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,8 +150,8 @@ GEM actionpack (>= 3.1) railties (>= 3.1) sass (>= 3.2) - jquery-rails (4.1.0) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) @@ -361,6 +361,7 @@ DEPENDENCIES pry-rails rack-livereload rails (= 4.2.6) + rake (= 10.5.0) rb-fsevent rspec-rails (= 2.14.2) sass-rails From cc309ebaee8cdc74199dfe0f6f2e42414ce9c3f7 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sun, 13 Mar 2016 18:34:13 -0400 Subject: [PATCH 02/13] Removed rake gem LOCKED DOWN --- Gemfile | 1 - Gemfile.lock | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a386989..2fb0d73 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,6 @@ source 'https://rubygems.org' #don't upgrade gem 'rails', '4.2.6' -gem 'rake', '10.5.0' # LOCKED DOWN ruby '2.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 32c1636..c8ad7c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (10.5.0) + rake (11.1.0) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -361,7 +361,6 @@ DEPENDENCIES pry-rails rack-livereload rails (= 4.2.6) - rake (= 10.5.0) rb-fsevent rspec-rails (= 2.14.2) sass-rails From 91edc5f283c79d432379221f24b53fcf34bf96fe Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 14 Mar 2016 09:11:39 -0400 Subject: [PATCH 03/13] Upgraded rake gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c8ad7c2..a3fc947 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (11.1.0) + rake (11.1.1) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) From fb923baee48d2ab52c2a4065affeefd85e76c1d2 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 19 Mar 2016 18:33:01 -0400 Subject: [PATCH 04/13] Upgraded rspec 2.14.2 to 2.99.0 --- Gemfile | 8 ++- Gemfile.lock | 66 ++++++++++++------- spec/helpers/api/v1/users_helper_spec.rb | 2 +- spec/helpers/password_resets_helper_spec.rb | 2 +- spec/helpers/pay_helper_spec.rb | 2 +- spec/models/benefits_spec.rb | 4 +- spec/models/pay_spec.rb | 2 +- spec/models/user_spec.rb | 10 +-- spec/spec_helper.rb | 11 ++++ .../password_resets/new.html.erb_spec.rb | 2 +- .../vulnerabilities/command_injection_spec.rb | 4 +- spec/vulnerabilities/mass_assignment_spec.rb | 6 +- spec/vulnerabilities/sql_injection_spec.rb | 4 +- 13 files changed, 80 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index 2fb0d73..a8b9101 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,14 @@ source 'https://rubygems.org' +gem 'gemdiff' + #don't upgrade gem 'rails', '4.2.6' ruby '2.3.0' +gem 'rake', '10.5.0' # LOCKED DOWN UNTIL MOVE TO RSPEC beta2. + # Bundle edge Rails instead: # gem 'rails', github: 'rails/rails' @@ -39,7 +43,7 @@ group :development, :test, :mysql do gem 'capybara' gem 'database_cleaner' gem 'poltergeist' - gem 'rspec-rails', '2.14.2' + gem 'rspec-rails', '2.99.0' # LOCKED DOWN gem 'test-unit' end @@ -72,7 +76,7 @@ gem 'jquery-rails' # Pow related gem gem 'powder' -gem 'aruba' +gem 'aruba', '0.9.0.pre' # LOCKED DOWN #gem 'minitest', '~> 4.0', :require=> "minitest/autorun" #gem 'minitest' diff --git a/Gemfile.lock b/Gemfile.lock index a3fc947..db7b1a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,13 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (6.0.3) - aruba (0.7.4) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) + aruba (0.9.0.pre) + childprocess (~> 0.5.6) + contracts (~> 0.9) + cucumber (>= 1.3.19) + ffi (~> 1.9.10) + rspec-expectations (>= 2.99) + thor (~> 0.19) bcrypt (3.1.11) better_errors (2.1.1) coderay (>= 1.0.0) @@ -82,8 +85,9 @@ GEM execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.1) + contracts (0.13.0) crack (0.3.1) - cucumber (2.3.2) + cucumber (2.3.3) builder (>= 2.1.2) cucumber-core (~> 1.4.0) cucumber-wire (~> 0.0.1) @@ -105,6 +109,8 @@ GEM erubis (2.7.0) eventmachine (1.0.9.1) execjs (2.6.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) ffi (1.9.10) foreman (0.78.0) thor (~> 0.19.1) @@ -114,6 +120,10 @@ GEM cucumber nokogiri trollop + gemdiff (1.0.1) + launchy (~> 2.4) + octokit (~> 4.0) + thor (~> 0.19) gherkin (3.2.0) globalid (0.3.6) activesupport (>= 4.1.0) @@ -135,9 +145,10 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - guard-rspec (4.3.1) + guard-rspec (4.6.4) guard (~> 2.1) - rspec (>= 2.14, < 4.0) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) guard-shell (0.7.1) guard (>= 2.0.0) guard-compat (~> 1.0) @@ -182,6 +193,7 @@ GEM minitest (5.8.4) multi_json (1.11.2) multi_test (0.1.2) + multipart-post (2.0.0) mysql2 (0.4.3) nenv (0.3.0) nokogiri (1.6.7.2) @@ -189,6 +201,8 @@ GEM notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -235,27 +249,30 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (11.1.1) + rake (10.5.0) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) ref (2.0.0) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.8) - rspec-expectations (2.14.5) + rspec (2.99.0) + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-collection_matchers (1.1.2) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (2.99.2) + rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rspec-mocks (2.99.4) + rspec-rails (2.99.0) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) + rspec-collection_matchers + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) ruby2ruby (2.3.0) ruby_parser (~> 3.1) sexp_processor (~> 4.0) @@ -269,6 +286,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) sexp_processor (4.7.0) shellany (0.0.1) simplecov (0.11.2) @@ -297,7 +317,7 @@ GEM sqlite3 (1.3.11) temple (0.7.6) terminal-table (1.5.2) - test-unit (3.1.7) + test-unit (3.1.8) power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) @@ -333,7 +353,7 @@ PLATFORMS ruby DEPENDENCIES - aruba + aruba (= 0.9.0.pre) bcrypt better_errors binding_of_caller @@ -346,6 +366,7 @@ DEPENDENCIES execjs foreman gauntlt + gemdiff guard-brakeman guard-livereload guard-rspec @@ -361,8 +382,9 @@ DEPENDENCIES pry-rails rack-livereload rails (= 4.2.6) + rake (= 10.5.0) rb-fsevent - rspec-rails (= 2.14.2) + rspec-rails (= 2.99.0) sass-rails simplecov sqlite3 diff --git a/spec/helpers/api/v1/users_helper_spec.rb b/spec/helpers/api/v1/users_helper_spec.rb index 9619df0..ddaf80a 100644 --- a/spec/helpers/api/v1/users_helper_spec.rb +++ b/spec/helpers/api/v1/users_helper_spec.rb @@ -13,4 +13,4 @@ describe Api::V1::UsersHelper do pending "add some examples to (or delete) #{__FILE__}" end -=end \ No newline at end of file +=end diff --git a/spec/helpers/password_resets_helper_spec.rb b/spec/helpers/password_resets_helper_spec.rb index b87346e..1e515dd 100644 --- a/spec/helpers/password_resets_helper_spec.rb +++ b/spec/helpers/password_resets_helper_spec.rb @@ -13,4 +13,4 @@ describe PasswordResetsHelper do pending "add some examples to (or delete) #{__FILE__}" end -=end \ No newline at end of file +=end diff --git a/spec/helpers/pay_helper_spec.rb b/spec/helpers/pay_helper_spec.rb index 408d779..b562100 100644 --- a/spec/helpers/pay_helper_spec.rb +++ b/spec/helpers/pay_helper_spec.rb @@ -13,4 +13,4 @@ describe PayHelper do pending "add some examples to (or delete) #{__FILE__}" end -=end \ No newline at end of file +=end diff --git a/spec/models/benefits_spec.rb b/spec/models/benefits_spec.rb index 043ae26..5dd5d00 100644 --- a/spec/models/benefits_spec.rb +++ b/spec/models/benefits_spec.rb @@ -11,7 +11,7 @@ describe User do end it "can be instantiated" do - Benefits.new.should be_an_instance_of(Benefits) + expect(Benefits.new).to be_an_instance_of(Benefits) end it "name can be updated" do @@ -19,6 +19,6 @@ describe User do user = User.all.first user.first_name = new_name user.save! - User.all.first.first_name.should == new_name + expect(User.all.first.first_name).to eq(new_name) end end diff --git a/spec/models/pay_spec.rb b/spec/models/pay_spec.rb index 1b4399c..40689ed 100644 --- a/spec/models/pay_spec.rb +++ b/spec/models/pay_spec.rb @@ -3,4 +3,4 @@ describe Pay do pending "add some examples to (or delete) #{__FILE__}" end -=end \ No newline at end of file +=end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index da9ae34..ff4b60f 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -11,20 +11,20 @@ describe User do end it "can be instantiated" do - User.new.should be_an_instance_of(User) + expect(User.new).to be_an_instance_of(User) end it "should require a email" do - User.new(:email => "").should_not be_valid + expect(User.new(:email => "")).not_to be_valid end 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 it "should require unique email" do user = User.all.first - User.new(:email => user.email).should_not be_valid + expect(User.new(:email => user.email)).not_to be_valid end it "name can be updated" do @@ -32,6 +32,6 @@ describe User do user = User.all.first user.first_name = new_name user.save! - User.all.first.first_name.should == new_name + expect(User.all.first.first_name).to eq(new_name) end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0613768..01b1f31 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -51,6 +51,17 @@ RSpec.configure do |config| config.after(:each) do DatabaseCleaner.clean 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 Capybara.javascript_driver = :poltergeist diff --git a/spec/views/password_resets/new.html.erb_spec.rb b/spec/views/password_resets/new.html.erb_spec.rb index fcb6721..36f35d4 100644 --- a/spec/views/password_resets/new.html.erb_spec.rb +++ b/spec/views/password_resets/new.html.erb_spec.rb @@ -3,4 +3,4 @@ describe "password_resets/new.html.erb" do pending "add some examples to (or delete) #{__FILE__}" end -=end \ No newline at end of file +=end diff --git a/spec/vulnerabilities/command_injection_spec.rb b/spec/vulnerabilities/command_injection_spec.rb index 8baed81..31a8939 100644 --- a/spec/vulnerabilities/command_injection_spec.rb +++ b/spec/vulnerabilities/command_injection_spec.rb @@ -23,6 +23,6 @@ feature 'command injection' do end click_on 'Start Upload' 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 \ No newline at end of file +end diff --git a/spec/vulnerabilities/mass_assignment_spec.rb b/spec/vulnerabilities/mass_assignment_spec.rb index 51dbc44..bf23aa2 100644 --- a/spec/vulnerabilities/mass_assignment_spec.rb +++ b/spec/vulnerabilities/mass_assignment_spec.rb @@ -7,7 +7,7 @@ feature 'mass assignment' do end scenario 'attack one' do - @normal_user.admin.should be_false + @normal_user.admin.should be_falsey login(@normal_user) @@ -17,7 +17,7 @@ feature 'mass assignment' do :password_confirmation => @normal_user.clear_password}} 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 scenario 'attack two' do @@ -31,7 +31,7 @@ feature 'mass assignment' do pending(:if => verifying_fixed?) { User.last.email.should == 'hackety@h4x0rs.c0m' - User.last.admin.should be_true + User.last.admin.should be_truthy } end end diff --git a/spec/vulnerabilities/sql_injection_spec.rb b/spec/vulnerabilities/sql_injection_spec.rb index 15ebdfd..cde02b8 100644 --- a/spec/vulnerabilities/sql_injection_spec.rb +++ b/spec/vulnerabilities/sql_injection_spec.rb @@ -8,7 +8,7 @@ feature 'sql injection' do end scenario 'attack' do - @admin_user.admin.should be_true + @admin_user.admin.should be_truthy login(@normal_user) @@ -29,4 +29,4 @@ feature 'sql injection' do @admin_user.admin.should == true } end -end \ No newline at end of file +end From 6173f1a2529cdb62f4c56905d129cd5409bf4e8a Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 19 Mar 2016 18:35:45 -0400 Subject: [PATCH 05/13] Removed gemdiff gem --- Gemfile | 2 -- Gemfile.lock | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/Gemfile b/Gemfile index a8b9101..592c99d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,5 @@ source 'https://rubygems.org' -gem 'gemdiff' - #don't upgrade gem 'rails', '4.2.6' diff --git a/Gemfile.lock b/Gemfile.lock index db7b1a3..09fa162 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,8 +109,6 @@ GEM erubis (2.7.0) eventmachine (1.0.9.1) execjs (2.6.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) ffi (1.9.10) foreman (0.78.0) thor (~> 0.19.1) @@ -120,10 +118,6 @@ GEM cucumber nokogiri trollop - gemdiff (1.0.1) - launchy (~> 2.4) - octokit (~> 4.0) - thor (~> 0.19) gherkin (3.2.0) globalid (0.3.6) activesupport (>= 4.1.0) @@ -193,7 +187,6 @@ GEM minitest (5.8.4) multi_json (1.11.2) multi_test (0.1.2) - multipart-post (2.0.0) mysql2 (0.4.3) nenv (0.3.0) nokogiri (1.6.7.2) @@ -201,8 +194,6 @@ GEM notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -286,9 +277,6 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) sexp_processor (4.7.0) shellany (0.0.1) simplecov (0.11.2) @@ -366,7 +354,6 @@ DEPENDENCIES execjs foreman gauntlt - gemdiff guard-brakeman guard-livereload guard-rspec From 9de84a4399d36a58cc2dab3426291ff21cfd805a Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 22 Mar 2016 20:29:12 -0400 Subject: [PATCH 06/13] Upgraded uglifier gem --- Gemfile.lock | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 09fa162..d4febe6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -324,9 +324,8 @@ GEM coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) unicorn (5.0.1) kgio (~> 2.6) rack From 63417602ebb329283c14bb78f617d04f251de485 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 23 Mar 2016 13:33:55 -0400 Subject: [PATCH 07/13] Upgraded mail and mime-types gems --- Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d4febe6..d2a5acd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,8 +170,8 @@ GEM loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.10) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) mailcatcher (0.6.4) activesupport (~> 4.0) eventmachine (= 1.0.9.1) @@ -182,7 +182,9 @@ GEM sqlite3 (~> 1.3) thin (~> 1.5.0) method_source (0.8.2) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) minitest (5.8.4) multi_json (1.11.2) From 0758b97e04e33f1faeb168fd7e5c28727a82c192 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sun, 27 Mar 2016 10:02:03 -0400 Subject: [PATCH 08/13] NOTE: gauntlt removed aruba dependency --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2a5acd..ac8bb47 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,6 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) - aruba cucumber nokogiri trollop From 051951665564627ad0bc12cc0777e4b62d57dcec Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 28 Mar 2016 20:11:45 -0400 Subject: [PATCH 09/13] Upgraded sass gem and added back aruba to gauntlt gem --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ac8bb47..c9155c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,6 +114,7 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) + aruba cucumber nokogiri trollop @@ -271,7 +272,7 @@ GEM ruby_parser (3.8.1) sexp_processor (~> 4.1) safe_yaml (1.0.4) - sass (3.4.21) + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) From c67a931a15fa0cecf892d406bf77151a38349527 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 29 Mar 2016 15:46:42 -0400 Subject: [PATCH 10/13] gauntlt gem removed aruba gem again --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c9155c2..7984a86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,6 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) - aruba cucumber nokogiri trollop From ac8ec6fe830153f984d340eb0465b81ecff2c25a Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 31 Mar 2016 20:44:37 -0400 Subject: [PATCH 11/13] Upgraded unicorn gem --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7984a86..04d458b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,6 +114,7 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) + aruba cucumber nokogiri trollop @@ -327,9 +328,8 @@ GEM thread_safe (~> 0.1) uglifier (3.0.0) execjs (>= 0.3.0, < 3) - unicorn (5.0.1) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) From 04e4c6975d46fb943901cf479d5ca50a2d67fd14 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 5 Apr 2016 10:34:36 -0400 Subject: [PATCH 12/13] Upgraded guard-rspec gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 04d458b..7bb3d37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - guard-rspec (4.6.4) + guard-rspec (4.6.5) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) From 98fb760fac92ac57846c139f2abf19453a595f31 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 6 Apr 2016 15:15:57 -0400 Subject: [PATCH 13/13] Upgraded sprockets gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7bb3d37..eb0231f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,7 +297,7 @@ GEM temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.0.4)