arbre2 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efcc5dbda3b170d592102cc1808e7de8204e8ad6
-  data.tar.gz: 1f148cf4b810471a62499b9ecef1abb02eacc330
+  metadata.gz: 93af3478dd8826c077b96a2aee7fb7dc1993085e
+  data.tar.gz: c09475cad5b20e8168124223885fea41717d52dc
 SHA512:
-  metadata.gz: 7b02b000969d694fcbed27422824b9030695155f43bf1dbda713b57a296f2cd3521c8cf00eb6300d4634da7b1a14ab871e96d2f094b5cc9e767f69e0d36a299a
-  data.tar.gz: 85efc9a9ea8ab43d5073c195764e4a7ee4047e01612b92a77c2590ad074785ac42444e0e3194f30c904c34c5d76b213b4eb3ce4510f6d22e37600d29ced31b9b
+  metadata.gz: d9301efdde9aba632671c56ed729945a81a22293e10401ecc69041542fadbce9f6d8e4d1fd16b9415daf783f1861492ed0ab90b9d3a88ec850b4d6590f4ad6ba
+  data.tar.gz: 1a4ec02ef8369886ef25ad72086b05248977aeb9f02c4b459d8dff672aa0ff8a95a36f0092ecca8a096bade835d09b540adaee652f8bbe71c3ac323faa98291d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.4
+
+* Upgraded specs to RSpec 3.0
+
 ## 2.2.3
 
 * Added `main` tag.

data/Gemfile.lock

@@ -13,9 +13,6 @@ GEM
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
     activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
@@ -43,18 +40,22 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.1)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.1)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -74,6 +75,6 @@ DEPENDENCIES
   bundler (~> 1.3)
   combustion (~> 0.5)
   rake
-  rspec-rails (~> 2.14)
+  rspec-rails (~> 3.0)
   simplecov
   tzinfo

data/arbre.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "tzinfo"
   s.add_development_dependency "combustion", "~> 0.5"
-  s.add_development_dependency "rspec-rails", "~> 2.14"
+  s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency "simplecov"
 end

data/lib/arbre/rspec/be_rendered_as_matcher.rb

@@ -76,7 +76,7 @@ module Arbre
         html
       end
 
-      def failure_message_for_should
+      def failure_message
         <<-MSG.gsub(/^\s{10}/, '')
           expected that element of type #{@actual.class} would be rendered differently:
             expected: #{expected.is_a?(Regexp) ? '/' + canonize_html(expected.source) + '/' : canonize_html(expected)} (#{expected.class})
@@ -84,7 +84,7 @@ module Arbre
         MSG
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         <<-MSG.gsub(/^\s{10}/, '')
           expected that element of type #{@actual.class} would not be rendered as #{canonize_html(expected)}, but it was:
             got: #{@actual.nil? ? 'nil' : canonize_html(ERB::Util.html_escape(@actual.to_s))}

data/lib/arbre/rspec/be_scripted_as_matcher.rb

@@ -44,7 +44,7 @@ module Arbre
         js
       end
 
-      def failure_message_for_should
+      def failure_message
         <<-MSG.gsub(/^\s{10}/, '')
           expected that element of type #{@actual.class} would be scripted differently:
             expected: #{expected.is_a?(Regexp) ? '/' + canonize_js(expected.source) + '/' : canonize_js(expected)} (#{expected.class})
@@ -52,7 +52,7 @@ module Arbre
         MSG
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected that element of type #{@actual.class} would be not scripted as #{expected}"
       end
 

data/lib/arbre/rspec/contain_script_matcher.rb

@@ -38,7 +38,7 @@ module Arbre
         js
       end
 
-      def failure_message_for_should
+      def failure_message
         <<-MSG.gsub(/^\s{10}/, '')
           expected that element of type #{@actual.class} contained script:
             expected: #{expected.is_a?(Regexp) ? '/' + canonize_js(expected.source) + '/' : canonize_js(expected)} (#{expected.class})
@@ -46,7 +46,7 @@ module Arbre
         MSG
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         <<-MSG.gsub(/^\s{10}/, '')
           expected that element of type #{actual.class} would not contain a script:
             script: #{expected.is_a?(Regexp) ? '/' + canonize_js(expected.source) + '/' : canonize_js(expected)} (#{expected.class})

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/spec/arbre/rails/rspec/arbre_support_spec.rb

@@ -23,7 +23,11 @@ describe Arbre::Rails::RSpec::ArbreSupport, arbre: true do
     end
   end
 
-  its(:assigns) { should eql({}) }
+  describe '#assigns' do
+    it "should be blank by default" do
+      expect(example.assigns).to eql({})
+    end
+  end
 
   describe '#helpers' do
     it "should build and memoize helpers" do
@@ -38,8 +42,18 @@ describe Arbre::Rails::RSpec::ArbreSupport, arbre: true do
     let(:helpers) { example.build_helpers }
 
     specify { expect(helpers).to be_a(ActionView::Base) }
-    specify { expect(helpers.controller).to be(controller) }
-    specify { expect(helpers.request).to be(request) }
+
+    it "should forward the controller to the helpers" do
+      controller = double()
+      allow(helpers).to receive(:controller).and_return(controller)
+      expect(helpers.controller).to be(controller)
+    end
+
+    it "should forward the request to the helpers" do
+      request = double()
+      allow(helpers).to receive(:request).and_return(request)
+      expect(helpers.request).to be(request)
+    end
 
     it "should mock an asset_path helper" do
       expect(helpers.asset_path('test')).to eql('/assets/test')

data/spec/arbre/rspec/be_rendered_as_matcher_spec.rb

@@ -14,7 +14,7 @@ describe Arbre::RSpec::BeRenderedAsMatcher do
   it "should fail if the actual's string version was not the same" do
     expect{ expect(double(:to_s => '<html></html>'.html_safe)).to be_rendered_as('<html/>') }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock would be rendered differently:
+        expected that element of type RSpec::Mocks::Double would be rendered differently:
           expected: <html/> (String)
                got: <html></html>
     STR
@@ -23,7 +23,7 @@ describe Arbre::RSpec::BeRenderedAsMatcher do
   it "should fail if the actual's string version did not match the regular expression" do
     expect{ expect(double(:to_s => '<html></html>'.html_safe)).to be_rendered_as(/regular* expression{1,2}/) }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock would be rendered differently:
+        expected that element of type RSpec::Mocks::Double would be rendered differently:
           expected: /regular* expression{1,2}/ (Regexp)
                got: <html></html>
     STR
@@ -32,7 +32,7 @@ describe Arbre::RSpec::BeRenderedAsMatcher do
   it "should fail if the actual's string was not HTML-safed" do
     expect{ expect(double(:to_s => '<html></html>')).to be_rendered_as('<html></html>') }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock would be rendered differently:
+        expected that element of type RSpec::Mocks::Double would be rendered differently:
           expected: <html></html> (String)
                got: &lt;html&gt;&lt;/html&gt;
     STR

data/spec/arbre/rspec/be_scripted_as_matcher_spec.rb

@@ -5,7 +5,7 @@ describe Arbre::RSpec::BeScriptedAsMatcher do
   it "should fail if the actual's content was not the same" do
     expect{ expect(double(:content => 'alert("test");')).to be_scripted_as('alert("something else");') }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock would be scripted differently:
+        expected that element of type RSpec::Mocks::Double would be scripted differently:
           expected: alert("something else"); (String)
                got: alert("test");
     STR
@@ -14,7 +14,7 @@ describe Arbre::RSpec::BeScriptedAsMatcher do
   it "should fail if the actual's content did not match the regular expression" do
     expect{ expect(double(:content => 'alert("test");')).to be_scripted_as(/regular* expression{1,2}/) }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock would be scripted differently:
+        expected that element of type RSpec::Mocks::Double would be scripted differently:
           expected: /regular* expression{1,2}/ (Regexp)
                got: alert("test");
     STR
@@ -40,7 +40,7 @@ describe Arbre::RSpec::BeScriptedAsMatcher do
   it "should fail if the whitespace difference was significant" do
     expect{ expect(double(:content => 'alert("test   " );')).to be_scripted_as('alert("test");') }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock would be scripted differently:
+        expected that element of type RSpec::Mocks::Double would be scripted differently:
           expected: alert("test"); (String)
                got: alert("test   " );
     STR

data/spec/arbre/rspec/contain_script_matcher_spec.rb

@@ -5,7 +5,7 @@ describe Arbre::RSpec::ContainScriptMatcher do
   it "should fail if the actual's content did not contain the given script" do
     expect{ expect(double(:to_s => '<script type="javascript">alert("test");</script>')).to contain_script('alert("something else");') }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock contained script:
+        expected that element of type RSpec::Mocks::Double contained script:
           expected: alert("something else"); (String)
                got: <script type="javascript">alert("test");</script>
     STR
@@ -31,7 +31,7 @@ describe Arbre::RSpec::ContainScriptMatcher do
   it "should fail if the whitespace difference was significant" do
     expect{ expect(double(:to_s => '<script type="javascript">alert("test   " );</script>')).to contain_script('alert("test");') }
       .to raise_error(RSpec::Expectations::ExpectationNotMetError, <<-STR.gsub(/^\s{8}/, ''))
-        expected that element of type RSpec::Mocks::Mock contained script:
+        expected that element of type RSpec::Mocks::Double contained script:
           expected: alert("test"); (String)
                got: <script type="javascript">alert("test   " );</script>
     STR

data/spec/arbre/unit/child_element_collection_spec.rb

@@ -59,13 +59,13 @@ describe ChildElementCollection do
     it "should not add or set the parent of the same element twice" do
       expect(element).to receive(:parent=).once.with(parent)
       collection << element << element
-      expect(collection).to have(1).item
+      expect(collection.size).to eql(1)
 
       collection = ChildElementCollection.new(parent)
       expect(element).to receive(:parent=).once.with(parent)
       collection << element
       collection.insert_at 0, element
-      expect(collection).to have(1).item
+      expect(collection.size).to eql(1)
     end
 
     it "should not unset the parent if the given element was not part of the collection" do

data/spec/arbre/unit/element_collection_spec.rb

@@ -17,19 +17,14 @@ describe ElementCollection do
 
     it "should behave like an array" do
       elements = ElementCollection.new([element1])
-      expect(elements).to have(1).item
-      expect(elements[0]).to be(element1)
+      expect(elements).to match([element1])
 
       elements << element2
-      expect(elements).to have(2).item
-      expect(elements[0]).to be(element1)
-      expect(elements[1]).to be(element2)
+      expect(elements).to match([element1, element2])
 
       elements = ElementCollection.new
       elements.concat [ element1, element2 ]
-      expect(elements).to have(2).item
-      expect(elements[0]).to be(element1)
-      expect(elements[1]).to be(element2)
+      expect(elements).to match([element1, element2])
 
       elements.clear
       expect(elements).to be_empty
@@ -41,13 +36,10 @@ describe ElementCollection do
       expect(collection[0]).to be_a(Element)
 
       expect(collection[0..1]).to be_a(ElementCollection)
-      expect(collection[0..1]).to have(2).items
-      expect(collection[0..1][0]).to be(element1)
-      expect(collection[0..1][1]).to be(element2)
+      expect(collection[0..1]).to match([element1, element2])
 
       expect(collection[0, 1]).to be_a(ElementCollection)
-      expect(collection[0, 1]).to have(1).items
-      expect(collection[0, 1][0]).to be(element1)
+      expect(collection[0, 1]).to match([element1])
     end
 
     it "should equate to an array" do
@@ -135,7 +127,7 @@ describe ElementCollection do
       collection = ElementCollection.new
       element = Element.new
       collection << element << element
-      expect(collection).to have(1).element
+      expect(collection.size).to eql(1)
     end
 
     specify "#to_a should create a copy of the elements and #to_ary not" do

data/spec/arbre/unit/element_spec.rb

@@ -88,8 +88,7 @@ describe Element do
         child = Element.new
         element << child
 
-        expect(element).to have(1).child
-        expect(element.children[0]).to be(child)
+        expect(element.children).to match([child])
       end
 
     end
@@ -165,8 +164,7 @@ describe Element do
         element << Element.new << Element.new
         element.content = "(CONTENT)"
 
-        expect(element).to have(1).child
-        expect(element.children[0]).to be_a(TextNode)
+        expect(element.children).to match([an_instance_of(TextNode)])
         expect(element.content).to eql('(CONTENT)')
       end
 
@@ -175,8 +173,7 @@ describe Element do
         child = Element.new
         element.content = child
 
-        expect(element).to have(1).child
-        expect(element.children[0]).to be(child)
+        expect(element.children).to match([child])
       end
 
       it "should clear any children and add a given element collection" do
@@ -201,9 +198,7 @@ describe Element do
 
         elements = element + element2
         expect(elements).to be_a(ElementCollection)
-        expect(elements).to have(2).items
-        expect(elements[0]).to be(element)
-        expect(elements[1]).to be(element2)
+        expect(elements).to match([element, element2])
       end
 
       it "should wrap itself in a collection and add the other elements" do
@@ -212,10 +207,7 @@ describe Element do
 
         elements = element + [ element2, element3 ]
         expect(elements).to be_a(ElementCollection)
-        expect(elements).to have(3).items
-        expect(elements[0]).to be(element)
-        expect(elements[1]).to be(element2)
-        expect(elements[2]).to be(element3)
+        expect(elements).to match([element, element2, element3])
       end
 
     end

data/spec/arbre/unit/html/tag_spec.rb

@@ -161,15 +161,15 @@ describe Tag do
 
       it "should allow access to the boolean attribute :autocomplete through a method" do
         tag.autocomplete = true
-        expect(tag.autocomplete).to be_true
+        expect(tag.autocomplete).to be_truthy
         expect(tag[:autocomplete]).to eql('autocomplete')
 
         tag.autocomplete = double(:something_trueish)
-        expect(tag.autocomplete).to be_true
+        expect(tag.autocomplete).to be_truthy
         expect(tag[:autocomplete]).to eql('autocomplete')
 
         tag.autocomplete = false
-        expect(tag.autocomplete).to be_false
+        expect(tag.autocomplete).to be_falsey
         expect(tag[:autocomplete]).to be_nil
       end
 

data/spec/arbre/unit/rails/layouts_spec.rb

@@ -73,7 +73,7 @@ describe Arbre::Rails::Layouts do
         arbre.document document_class, :one, :two, &block
         arbre.layout
         expect(arbre.children.first).to be_a(document_class)
-        expect(called).to be_true
+        expect(called).to be_truthy
       end
 
       it "should execute the content block on the document if it was not called from its build! method" do
@@ -87,7 +87,7 @@ describe Arbre::Rails::Layouts do
         arbre.document document_class, :one, :two, &block
         arbre.layout
         expect(arbre.children.first).to be_a(document_class)
-        expect(called).to be_true
+        expect(called).to be_truthy
         expect(receiver).to be(arbre.children.first)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arbre2
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Greg Bell
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement