Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bump rails to 3.2.13

this involved
 *  bumping the mocha dependency
 *  updating the test helper to turn off a warning from the new mocha version
 *  adding a missing route into a test (which only started failing after the upgrade)
 *  adding a reset of the Zendesk dummy client (which was exposed after the testcase order changed)
  • Loading branch information...
commit 3ba48fd6fd382955b6db2fa9341756a9f7b0d018 1 parent eb5534e
@benilovj benilovj authored
View
4 Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
source 'https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/'
-gem 'rails', '3.2.12'
+gem 'rails', '3.2.13'
group :assets do
gem 'less-rails-bootstrap', '2.1.1'
@@ -31,7 +31,7 @@ group :development do
end
group :test do
- gem "mocha", "0.12.6", require: false
+ gem "mocha", "0.13.3", require: false
gem "shoulda", "~> 3.3.2"
gem "webmock", "1.9.0"
gem 'capybara', '1.1.2'
View
68 Gemfile.lock
@@ -2,12 +2,12 @@ GEM
remote: https://rubygems.org/
remote: https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -15,19 +15,19 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
@@ -119,15 +119,15 @@ GEM
libv8 (3.3.10.4)
libwebsocket (0.1.5)
addressable
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.21)
- mocha (0.12.6)
+ mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.5.1)
+ multi_json (1.7.1)
multipart-post (1.1.5)
nokogiri (1.5.5)
null_logger (0.0.1)
@@ -165,24 +165,24 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
json (~> 1.4)
redis (3.0.2)
redis-actionpack (3.2.3)
@@ -226,12 +226,12 @@ GEM
therubyracer (0.9.10)
libv8 (~> 3.3.10)
thor (0.17.0)
- tilt (1.3.3)
+ tilt (1.3.6)
timeliness (0.3.7)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -273,11 +273,11 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails (= 2.0.2)
less-rails-bootstrap (= 2.1.1)
- mocha (= 0.12.6)
+ mocha (= 0.13.3)
plek (= 1.1.0)
poltergeist (= 0.7.0)
quiet_assets (= 1.0.2)
- rails (= 3.2.12)
+ rails (= 3.2.13)
redis-rails (= 3.2.3)
sass-rails (~> 3.2.3)
shoulda (~> 3.3.2)
View
1  test/functional/requests_controller_test.rb
@@ -54,6 +54,7 @@ class RequestsControllerTest < ActionController::TestCase
Rails.application.routes.draw do
match 'new' => "test_requests#new"
match 'create' => "test_requests#create"
+ match "acknowledge" => "support#acknowledge"
end
@controller = TestRequestsController.new
View
3  test/test_helper.rb
@@ -2,7 +2,7 @@
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
-require 'mocha_standalone'
+require 'mocha/api'
require 'webmock/minitest'
require 'ostruct'
@@ -24,6 +24,7 @@ def login_as_stub_user(name = "Stubby McStubby", email = "stubby@gov.uk")
def switch_zendesk_into_dummy_mode
@zendesk_api = GDS_ZENDESK_CLIENT
+ @zendesk_api.reset
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.