From 9702891e5e5ee96c0a49dc108f95030376d43969 Mon Sep 17 00:00:00 2001 From: Tsutomu Kuroda Date: Thu, 19 Dec 2013 09:37:16 +0900 Subject: [PATCH] Update gemspec and spec_helper.rb --- .gitignore | 1 - Gemfile.lock | 108 ++++++++++++++++++++++++++++++++++++++++++++ rails-i18n.gemspec | 2 +- spec/spec_helper.rb | 2 + 4 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index a8b6eec13..79652ac03 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ Icon? ._* .project -Gemfile.lock rails-i18n-*.gem *~ *.sw[pno] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..920bfb989 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,108 @@ +PATH + remote: . + specs: + rails-i18n (4.0.0) + i18n (~> 0.6) + rails (~> 4.0) + +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.0.2) + actionpack (= 4.0.2) + mail (~> 2.5.4) + actionpack (4.0.2) + activesupport (= 4.0.2) + builder (~> 3.1.0) + erubis (~> 2.7.0) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activemodel (4.0.2) + activesupport (= 4.0.2) + builder (~> 3.1.0) + activerecord (4.0.2) + activemodel (= 4.0.2) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.2) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.2) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + arel (4.0.1) + atomic (1.1.14) + builder (3.1.4) + diff-lcs (1.2.5) + erubis (2.7.0) + hike (1.2.3) + i18n (0.6.9) + i18n-spec (0.4.0) + iso + iso (0.2.0) + i18n + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + minitest (4.7.5) + multi_json (1.8.2) + polyglot (0.3.3) + rack (1.5.2) + rack-test (0.6.2) + rack (>= 1.0) + rails (4.0.2) + actionmailer (= 4.0.2) + actionpack (= 4.0.2) + activerecord (= 4.0.2) + activesupport (= 4.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.2) + sprockets-rails (~> 2.0.0) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.1.0) + rspec-core (2.14.7) + rspec-expectations (2.14.4) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.4) + rspec-rails (2.14.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + spork (1.0.0rc3) + sprockets (2.10.1) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + thor (0.18.1) + thread_safe (0.1.3) + atomic + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.38) + +PLATFORMS + ruby + +DEPENDENCIES + i18n-spec (= 0.4.0) + rails (= 4.0.2) + rails-i18n! + rspec-rails (= 2.14.0) + spork (= 1.0.0rc3) diff --git a/rails-i18n.gemspec b/rails-i18n.gemspec index 8203db420..966b2a4b2 100644 --- a/rails-i18n.gemspec +++ b/rails-i18n.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency('i18n', '~> 0.6') s.add_dependency('rails', '~> 4.0') - s.add_development_dependency "rails", "= 4.0.0" + s.add_development_dependency "rails", "= 4.0.2" s.add_development_dependency "rspec-rails", "= 2.14.0" s.add_development_dependency "i18n-spec", "= 0.4.0" s.add_development_dependency "spork", "= 1.0.0rc3" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 739e9300e..b41840e1f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,6 +9,8 @@ require 'unit/matchers/have_missing_particular_pluralization_keys_matcher' require 'unit/matchers/have_keys_for_restrict_dependent_destroy_matcher' +I18n.enforce_available_locales = false + RSpec.configure do |config| config.mock_with :rspec config.fail_fast = true