Ran transpec to prepare for RSpec 3.0.x upgrade. Updated some gems to…

… deal with system incompatibilities. Added a .travis.yml file
alfie-max · Dec 27, 2015 · 4b3f368 · 4b3f368
1 parent f3fd125
commit 4b3f368
Show file tree

Hide file tree

Showing 13 changed files with 305 additions and 267 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.3.0
+  - 2.2.3
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,10 @@
 source "https://rubygems.org"
 
-gem "devise"
+gem "devise", '< 3.0.0'
 gem 'authy'
 
 group :development do
-  gem "rspec"
+  gem "rspec", "> 2.14.1", "< 3.0"
   gem "yard"
   gem "rdoc"
   gem "bundler"
@@ -16,9 +16,10 @@ group :development do
 end
 
 group :test do
-  gem "rails"
+  gem "rails", "~> 3.2.6"
   gem "sqlite3"
   gem 'rspec-rails'
   gem 'database_cleaner'
   gem 'capybara'
+  gem 'test-unit'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,69 +1,74 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
+      mail (~> 2.5.4)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.6)
-    arel (3.0.2)
-    authy (2.4.0)
-      httpclient (>= 2.3.4)
-    bcrypt-ruby (3.0.1)
+    addressable (2.4.0)
+    arel (3.0.3)
+    authy (2.6.1)
+      httpclient (>= 2.5.3.3)
+    bcrypt (3.1.10)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.0.4)
-    capybara (2.1.0)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    coderay (1.0.9)
-    database_cleaner (0.9.1)
-    devise (2.2.3)
+    coderay (1.1.0)
+    database_cleaner (1.5.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     erubis (2.7.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.2)
-      addressable
-      faraday (~> 0.8.7)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.6.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
       oauth2
-    hashie (2.1.1)
-    highline (1.6.21)
-    hike (1.2.2)
-    httpclient (2.5.3.3)
-    i18n (0.6.1)
+    hashie (3.4.3)
+    highline (1.7.8)
+    hike (1.2.3)
+    httpclient (2.7.0.1)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -74,103 +79,110 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    jquery-rails (2.2.1)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    json (1.8.3)
+    jwt (1.5.2)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.22)
-    mini_portile (0.5.3)
-    multi_json (1.7.2)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile2 (2.0.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
+    multipart-post (2.0.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    orm_adapter (0.4.0)
-    polyglot (0.3.3)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    orm_adapter (0.5.0)
+    polyglot (0.3.5)
+    power_assert (0.2.6)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
+    rack (1.4.7)
+    rack-cache (1.5.1)
       rack (>= 0.4)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.0)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    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.13.1)
-    rspec-rails (2.13.0)
+    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.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    sass (3.2.7)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    sass (3.4.20)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.4)
-    sprockets (2.2.2)
+    simplecov (0.11.1)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    tilt (1.3.7)
-    treetop (1.4.12)
+    sqlite3 (1.3.11)
+    test-unit (3.1.5)
+      power_assert
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.1)
+    tzinfo (0.3.46)
+    warden (1.2.4)
       rack (>= 1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.6.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -180,15 +192,19 @@ DEPENDENCIES
   bundler
   capybara
   database_cleaner
-  devise
+  devise (< 3.0.0)
   jeweler (>= 2.0.1)
   jquery-rails
   pry
-  rails
+  rails (~> 3.2.6)
   rdoc
-  rspec
+  rspec (> 2.14.1, < 3.0)
   rspec-rails
   sass-rails
   simplecov
   sqlite3
+  test-unit
   yard
+
+BUNDLED WITH
+   1.11.2