warp 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3adb8eb57a1a07e3946d9a6509ab2c5b3c0f3a7c
-  data.tar.gz: 5bcbf3b706f9357ce933dbe0660df9e743250c51
+  metadata.gz: e70da9075f2beae56344d463b528607d1f18b1ec
+  data.tar.gz: 8c6ed89c28d1e174b2ac313267dc8665f176b3f4
 SHA512:
-  metadata.gz: f78ea0011cfa93e17bde6342e458159a8db8ba06bee83befd6522e7473d2b09f7a2cef25a44245031ebbf7ee970c868755facf0d835c217d33dac08c875f17fe
-  data.tar.gz: aaeaeb5a5ed4101a166c4727a6bb2376d659744e65bebb7fcb028a58c57e2841a6a3b8e3320b6ad6209eb310991b53796da6b69b446505b5e491283b83ef87c7
+  metadata.gz: 61e2ab2c14102df7ed581ab6d4a81d1889aaa852650b77b6113c7181dda8204154fd41fb0c01db05e564e8182aa19df4b4d889c28320e728d6b7be4f4de0169b
+  data.tar.gz: b1a7666e777fcb4ba6aeb1c25830b189870399e1ac80868a3350ca21c6fddbbca9ed40dddb523c5951574a05759684c9e85abdc6ecd932d7003a23df5a266e10

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
 
+sudo: false
+cache: bundler
+
 env:
   global:
     - TRAVIS_CI=1
 
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.5
   - 2.2.1
 
 gemfile:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+- 1.5.0
+  - Reinstated HABTM matcher for Rails 4.1+
+
 - 1.4.0
   - Dropped support for RSpec 2.
   - Assignment matchers handle nil values better.

data/lib/warp/model_matchers/association_matcher.rb

@@ -4,7 +4,7 @@ module Warp
   module ModelMatchers
     class AssociationMatcher < Warp::ModelMatchers::Matcher
       attr_reader :expected_macro, :key
-      
+
       def initialize(expected_macro, key)
         @expected_macro = expected_macro
         @key = key
@@ -56,11 +56,7 @@ module Warp
     end
 
     def have_and_belong_to_many(key)
-      if ActiveRecord::VERSION::STRING[0] == "4" && ActiveRecord::VERSION::STRING[3] != "0"
-        raise NotImplementedError, "In Rail 4.1+ the has_and_belongs_to_many helper produces a has_many :through association."
-      else
-        AssociationMatcher.new(:has_and_belongs_to_many, key)
-      end
+      AssociationMatcher.new(:has_and_belongs_to_many, key)
     end
   end
-end
+end

data/lib/warp/version.rb

@@ -1,7 +1,7 @@
 module Warp
   module VERSION
     MAJOR = 1
-    MINOR = 4
+    MINOR = 5
     PATCH = 0
 
     BETA = nil

data/spec/warp/{model_helpers → model_matchers}/association_matcher_spec.rb

@@ -20,16 +20,12 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
     end
 
     behaviour do
-      if ActiveRecord::VERSION::STRING[0] == "4" && ActiveRecord::VERSION::STRING[3] != "0"
-        specify { expect{ have_and_belong_to_many(:foo) }.to raise_error(NotImplementedError) }
-      end
-
       with_contexts do
         let(:no_association_key) { :foobar }
 
         describe "#have_many" do
           let(:matcher) { have_many(key) }
-          
+
           let(:matcher_macro) { :has_many }
           let(:association_key) { :bars }
           let(:wrong_association_key) { :foo }
@@ -37,7 +33,7 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
 
         describe "#have_one" do
           let(:matcher) { have_one(key) }
-          
+
           let(:matcher_macro) { :has_one }
           let(:association_key) { :baz }
           let(:wrong_association_key) { :foo }
@@ -45,21 +41,18 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
 
         describe "#belong_to" do
           let(:matcher) { belong_to(key) }
-          
+
           let(:matcher_macro) { :belongs_to }
           let(:association_key) { :foo }
           let(:wrong_association_key) { :bars }
         end
 
-        
-        unless ActiveRecord::VERSION::STRING[0] == "4" && ActiveRecord::VERSION::STRING[3] != "0"
-          describe "#have_and_belong_to_many" do
-            let(:matcher) { have_and_belong_to_many(key) }
-            
-            let(:matcher_macro) { :has_and_belongs_to_many }
-            let(:association_key) { :qux }
-            let(:wrong_association_key) { :foo }
-          end
+        describe "#have_and_belong_to_many" do
+          let(:matcher) { have_and_belong_to_many(key) }
+
+          let(:matcher_macro) { :has_and_belongs_to_many }
+          let(:association_key) { :qux }
+          let(:wrong_association_key) { :foo }
         end
 
         behaviour do
@@ -70,7 +63,7 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
               let(:key) { association_key }
 
               specify { expect(subject).to match(model_or_instance) }
-            
+
               describe_failure_message_when_negated do
                 specify { expect(subject).to eq "expected TestModel to not have a #{matcher_macro} association with :#{key}" }
               end
@@ -81,7 +74,7 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
               let(:actual_macro) { model.reflect_on_association(key).macro }
 
               specify { expect(subject).to_not match(model_or_instance) }
-            
+
               describe_failure_message do
                 specify { expect(subject).to eq "expected TestModel to have a #{matcher_macro} association with :#{key}, but had a #{actual_macro} association with :#{key}" }
               end
@@ -92,7 +85,7 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
             let(:key) { no_association_key }
 
             specify { expect(subject).to_not match(model_or_instance) }
-          
+
             describe_failure_message do
               specify { expect(subject).to eq "expected TestModel to have a #{matcher_macro} association with :#{key}" }
             end
@@ -101,4 +94,4 @@ describe Warp::ModelMatchers::AssociationMatcher, type: :model do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Thomas Drake-Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -88,9 +88,9 @@ files:
 - spec/warp/controller_matchers/assign_matcher_spec.rb
 - spec/warp/controller_matchers/set_flash_matcher_spec.rb
 - spec/warp/instrument_spec.rb
-- spec/warp/model_helpers/association_matcher_spec.rb
-- spec/warp/model_helpers/attribute_matcher_spec.rb
-- spec/warp/model_helpers/validation_matcher_spec.rb
+- spec/warp/model_matchers/association_matcher_spec.rb
+- spec/warp/model_matchers/attribute_matcher_spec.rb
+- spec/warp/model_matchers/validation_matcher_spec.rb
 - warp.gemspec
 homepage: https://github.com/thomasfedb/warp
 licenses:
@@ -128,6 +128,6 @@ test_files:
 - spec/warp/controller_matchers/assign_matcher_spec.rb
 - spec/warp/controller_matchers/set_flash_matcher_spec.rb
 - spec/warp/instrument_spec.rb
-- spec/warp/model_helpers/association_matcher_spec.rb
-- spec/warp/model_helpers/attribute_matcher_spec.rb
-- spec/warp/model_helpers/validation_matcher_spec.rb
+- spec/warp/model_matchers/association_matcher_spec.rb
+- spec/warp/model_matchers/attribute_matcher_spec.rb
+- spec/warp/model_matchers/validation_matcher_spec.rb