Unverified Commit de4afb2d authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Bump jasmine

parent c0713ddd

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ group :development, :test do 
  gem "cucumber-rails", "1.5.0", require: false



  # Jasmine (client side application tests (JS))

  gem "jasmine",                   "2.6.0"

  gem "jasmine",                   "2.7.0"

  gem "jasmine-jquery-rails",      "2.0.3"

  gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org"

  gem "sinon-rails",               "1.15.0"

Gemfile.lock

+4 −4
Original line number Diff line number Diff line
@@ -313,12 +313,12 @@ GEM 
      i18n-inflector (~> 2.6)

      railties (>= 3.0.0)

    ipaddress (0.8.3)

    jasmine (2.6.0)

      jasmine-core (>= 2.6.0, < 3.0.0)

    jasmine (2.7.0)

      jasmine-core (>= 2.7.0, < 3.0.0)

      phantomjs

      rack (>= 1.2.1)

      rake

    jasmine-core (2.6.4)

    jasmine-core (2.7.0)

    jasmine-jquery-rails (2.0.3)

    jquery-rails (4.3.1)

      rails-dom-testing (>= 1, < 3)
@@ -805,7 +805,7 @@ DEPENDENCIES 
  handlebars_assets (= 0.23.2)

  http_accept_language (= 2.1.1)

  i18n-inflector-rails (= 1.0.7)

  jasmine (= 2.6.0)

  jasmine (= 2.7.0)

  jasmine-jquery-rails (= 2.0.3)

  jquery-rails (= 4.3.1)

  js-routes (= 1.3.3)