diff --git a/.travis.yml b/.travis.yml index fea403c..d3438b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: ruby rvm: - 1.9.3 + - 2.1.1 + - 2.1.2 gemfile: - Gemfile.ci diff --git a/Gemfile b/Gemfile index e5a9c75..28017c0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '~>3.2.11' group :development, :test do gem 'sqlite3' diff --git a/Gemfile.ci b/Gemfile.ci index 94379e7..e153e69 100644 --- a/Gemfile.ci +++ b/Gemfile.ci @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '~>3.2.11' group :development, :test do gem 'sqlite3' @@ -27,5 +27,5 @@ group :assets do gem 'uglifier', '>= 1.0.3' end -gem 'bcrypt-ruby' -gem 'jquery-rails' \ No newline at end of file +gem 'bcrypt-ruby', '~> 3.0.0' +gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 2d9d22a..2697d90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,7 +167,7 @@ DEPENDENCIES newrelic_rpm pg rack-mini-profiler - rails (= 3.2.11) + rails (~> 3.2.11) redcarpet rspec-rails safe_yaml diff --git a/spec/models/checklist_answer_spec.rb b/spec/models/checklist_answer_spec.rb deleted file mode 100644 index ce2041e..0000000 --- a/spec/models/checklist_answer_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe ChecklistAnswer do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/checklist_question_spec.rb b/spec/models/checklist_question_spec.rb deleted file mode 100644 index f42db77..0000000 --- a/spec/models/checklist_question_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe ChecklistQuestion do - pending "add some examples to (or delete) #{__FILE__}" -end