Upgrade Teaspoon from 1.0.1 to 1.1.5.

Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).

Upgrade Teaspoon from 1.0.1 to 1.1.5.
e664d954 · connorshea · 28c94ee9 · e664d954 · e664d954
Commit e664d954 authored Mar 25, 2016 by connorshea
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +6 -3

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -279,7 +279,7 @@ group :development, :test do
  gem 'capybara-screenshot', '~> 1.0.0'
  gem 'poltergeist',         '~> 1.9.0'

-  gem 'teaspoon', '~> 1.0.0'
+  gem 'teaspoon', '~> 1.1.0'
  gem 'teaspoon-jasmine', '~> 2.2.0'

  gem 'spring', '~> 1.6.4'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -806,8 +806,8 @@ GEM
    systemu (2.6.5)
    task_list (1.0.2)
      html-pipeline
-    teaspoon (1.0.2)
-      railties (>= 3.2.5, < 5)
+    teaspoon (1.1.5)
+      railties (>= 3.2.5, < 6)
    teaspoon-jasmine (2.2.0)
      teaspoon (>= 1.0.0)
    temple (0.7.6)
@@ -1048,7 +1048,7 @@ DEPENDENCIES
  sprockets (~> 3.3.5)
  state_machines-activerecord (~> 0.3.0)
  task_list (~> 1.0.2)
-  teaspoon (~> 1.0.0)
+  teaspoon (~> 1.1.0)
  teaspoon-jasmine (~> 2.2.0)
  test_after_commit (~> 0.4.2)
  thin (~> 1.6.1)
@@ -1064,3 +1064,6 @@ DEPENDENCIES
  web-console (~> 2.0)
  webmock (~> 1.21.0)
  wikicloth (= 0.8.1)
+
+BUNDLED WITH
+   1.11.2