Merge pull request #4 from polydice/support-rails5

Support rails5

.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.2.4
+  - 2.3.3

flavors.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "railties", [">= 3.2", "< 5"]
-  gem.add_dependency "activesupport", [">= 3.2", "< 5"]
-  gem.add_dependency "activerecord", [">= 3.2", "< 5"]
+  gem.add_dependency "railties", ">= 5.0.0"
+  gem.add_dependency "activesupport", ">= 5.0.0"
+  gem.add_dependency "activerecord", ">= 5.0.0"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "shoulda-matchers"
+  gem.add_development_dependency "shoulda-matchers", ">= 3.1"
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "coveralls"
 end

lib/flavors/version.rb

@@ -1,3 +1,3 @@
 module Flavors
-  VERSION = "0.6.0"
+  VERSION = "1.0.0.rc.1"
 end

spec/preference_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-describe Flavors::Preference do
-
+describe Flavors::Preference, type: :model do
   it { is_expected.to belong_to(:prefered) }
-
 end

spec/spec_helper.rb

@@ -12,6 +12,14 @@
   config.formatter = 'documentation'
 end
 
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :active_record
+    with.library :active_model
+  end
+end
+
 # Define the application and configuration
 module Config
   class Application < ::Rails::Application