Commit 8b91863

mo khan <mo@mokhan.ca>
2015-04-12 18:21:18
upgrade gems.
1 parent b62949a
Changed files (4)
spec/factories/items.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :item do
-    name Faker::Name.name
-    description Faker::HipsterIpsum.words(50)
+    name FFaker::Name.name
+    description FFaker::HipsterIpsum.words(50)
     serial_number SecureRandom.uuid
     purchase_price { (rand(1_000) + rand).round(2) }
     purchased_at DateTime.now
spec/factories/users.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :user do
-    username { Faker::Internet.user_name }
-    email { Faker::Internet.email }
+    username { FFaker::Internet.user_name }
+    email { FFaker::Internet.email }
     password "password"
     password_confirmation "password"
     terms_and_conditions "1"
spec/support/pages/new_registration_page.rb
@@ -5,8 +5,8 @@ class NewRegistrationPage < PageModel
     super(new_registration_path)
   end
 
-  def register_with(username: Faker::Internet.user_name,
-                    email: Faker::Internet.email,
+  def register_with(username: FFaker::Internet.user_name,
+                    email: FFaker::Internet.email,
                     password: "password",
                     accept_terms: true)
     within "#new_user" do
Gemfile.lock
@@ -37,14 +37,12 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.0)
-    bcrypt (3.1.9)
+    bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -55,25 +53,26 @@ GEM
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1.1)
     columnize (0.9.0)
-    coveralls (0.7.3)
+    coveralls (0.8.0)
       multi_json (~> 1.10)
-      rest-client (~> 1.7)
+      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    database_cleaner (1.4.0)
+    database_cleaner (1.4.1)
     debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dotenv (1.0.2)
-    dotenv-rails (1.0.2)
-      dotenv (= 1.0.2)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.0.1)
+    dotenv-rails (2.0.1)
+      dotenv (= 2.0.1)
     easy_translate (0.5.0)
       json
       thread
@@ -81,64 +80,63 @@ GEM
     email_validator (1.5.0)
       activemodel
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.5.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffaker (1.31.0)
-    foreman (0.76.0)
-      dotenv (~> 1.0.2)
+    ffaker (2.0.0)
+    foreman (0.78.0)
       thor (~> 0.19.1)
-    foundation-rails (5.4.5.0)
+    foundation-rails (5.5.1.2)
       railties (>= 3.1.0)
-      sass (>= 3.2.0)
-    globalid (0.3.0)
+      sass (>= 3.3.0, < 3.5)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
-    highline (1.6.21)
-    hike (1.2.3)
+    highline (1.7.1)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     i18n (0.7.0)
-    i18n-tasks (0.7.10)
+    i18n-tasks (0.8.2)
       activesupport
       easy_translate (>= 0.5.0)
       erubis
       highline
       i18n
-      slop (>= 3.5.0)
       term-ansicolor
       terminal-table
-    jbuilder (2.2.6)
+    jbuilder (2.2.13)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (4.0.2)
+    jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
-    multi_json (1.10.1)
-    netrc (0.10.2)
-    nokogiri (1.6.5)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    pg (0.17.1)
-    poltergeist (1.5.1)
+    pg (0.18.1)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    puma (2.11.1)
+    puma (2.11.2)
       rack (>= 1.1, < 2.0)
     rack (1.6.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rack-timeout (0.2.0)
+    rack-timeout (0.2.4)
     rails (4.2.0)
       actionmailer (= 4.2.0)
       actionpack (= 4.2.0)
@@ -152,16 +150,16 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.3)
+    rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
     railties (4.2.0)
       actionpack (= 4.2.0)
@@ -170,28 +168,29 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     rdoc (4.2.0)
-      json (~> 1.4)
-    rest-client (1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sass (3.4.9)
-    sass-rails (5.0.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    sass (3.4.13)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -200,51 +199,50 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    spring (1.2.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    spring (1.3.4)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-commands-teaspoon (0.0.2)
       spring (>= 0.9.1)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.0.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    teaspoon (0.8.0)
+    teaspoon (0.9.1)
       railties (>= 3.2.5, < 5)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-table (1.4.5)
     thor (0.19.1)
-    thread (0.1.4)
-    thread_safe (0.3.4)
+    thread (0.2.0)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    tins (1.3.3)
+    tins (1.3.5)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.6.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    web-console (2.0.0)
-      activemodel (~> 4.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
+    web-console (2.1.2)
+      activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
-      railties (~> 4.0)
+      railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    websocket-driver (0.5.1)
+    websocket-driver (0.5.4)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.1)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)