Bump RSpec to 3.4.0

Author: Trung Lê

.rspec

@@ -1 +1,2 @@
 --colour
+--format progress

Rakefile

@@ -8,7 +8,6 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = ["--colour", "--format", "nested"]
 end
 
 task :default => :spec

representative.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.version = Representative::VERSION.dup
   gem.platform = Gem::Platform::RUBY
 
-  gem.add_development_dependency("rspec", "~> 2.13.0")
+  gem.add_development_dependency("rspec", "~> 3.4.0")
   gem.add_runtime_dependency("activesupport-json_encoder", ">= 1.1.0")
   gem.add_runtime_dependency("i18n", ">= 0.4.1")
   gem.add_runtime_dependency("builder", ">= 2.1.2")

spec/representative/json_spec.rb

@@ -20,7 +20,7 @@ def resulting_json
 
         it "outputs the value as JSON" do
           r.element :name, "Fred"
-          resulting_json.should == %{"Fred"\n}
+          expect(resulting_json).to eq %{"Fred"\n}
         end
 
       end
@@ -29,7 +29,7 @@ def resulting_json
 
         it "outputs the value as JSON" do
           r.element :age, 36
-          resulting_json.should == "36\n"
+          expect(resulting_json).to eq "36\n"
         end
 
       end
@@ -38,7 +38,7 @@ def resulting_json
 
         it "generates null" do
           r.element :flavour, nil
-          resulting_json.should == "null\n"
+          expect(resulting_json).to eq "null\n"
         end
 
         describe "and a block" do
@@ -47,7 +47,7 @@ def resulting_json
             r.element :book, nil do
               r.element :author
             end
-            resulting_json.should == "null\n"
+            expect(resulting_json).to eq "null\n"
           end
 
         end
@@ -63,7 +63,7 @@ def resulting_json
             r.element :book, @book, :lang => :lang do
               r.element :title
             end
-            resulting_json.should == undent(<<-JSON)
+            expect(resulting_json).to eq undent(<<-JSON)
             {
               "@lang": "fr",
               "title": "En Edge"
@@ -77,7 +77,7 @@ def resulting_json
 
           it "ignores the attributes" do
             r.element :review, "Blah de blah", :lang => "fr"
-            resulting_json.should == undent(<<-JSON)
+            expect(resulting_json).to eq undent(<<-JSON)
             "Blah de blah"
             JSON
           end
@@ -93,7 +93,7 @@ def resulting_json
           r.representing(@author) do
             r.element :name
           end
-          resulting_json.should == %{"Fred"\n}
+          expect(resulting_json).to eq %{"Fred"\n}
         end
 
       end
@@ -103,7 +103,7 @@ def resulting_json
         it "outputs an object" do
           r.element :something, Object.new do
           end
-          resulting_json.should == "{}\n"
+          expect(resulting_json).to eq "{}\n"
         end
 
       end
@@ -116,7 +116,7 @@ def resulting_json
 
         it "outputs the array as JSON" do
           r.list_of :names, %w(Hewey Dewey Louie)
-          resulting_json.should == undent(<<-JSON)
+          expect(resulting_json).to eq undent(<<-JSON)
           [
             "Hewey",
             "Dewey",
@@ -134,7 +134,7 @@ def resulting_json
           r.element(:duck, @donald) do
             r.list_of :nephews
           end
-          resulting_json.should == undent(<<-JSON)
+          expect(resulting_json).to eq undent(<<-JSON)
           {
             "nephews": [
               "Hewey",
@@ -159,7 +159,7 @@ def resulting_json
             r.element :name
             r.element :age
           end
-          resulting_json.should == undent(<<-JSON)
+          expect(resulting_json).to eq undent(<<-JSON)
           [
             {
               "name": "Hewey",
@@ -190,7 +190,7 @@ def resulting_json
             r.element :name
             r.element :age
           end
-          resulting_json.should == undent(<<-JSON)
+          expect(resulting_json).to eq undent(<<-JSON)
           [
             {
               "@about": "Hewey is 3 years old",
@@ -215,16 +215,18 @@ def resulting_json
       describe "with list attributes" do
         it "raises an ArgumentError" do
           @authors = []
-          lambda{ r.list_of(:authors, @authors, :list_attributes => {}) {} }.should raise_exception(ArgumentError)
+          expect(-> {
+            r.list_of(:authors, @authors, :list_attributes => {}) {}
+          }).to raise_exception(ArgumentError)
         end
       end
 
       describe "with unnecessary arguments" do
         it "raises an ArgumentError" do
           @authors = []
-          lambda{
+          expect(-> {
             r.list_of(:authors, @authors, :unecessary_arg_should_cause_failure, :item_attributes => {}){}
-          }.should raise_exception(ArgumentError)
+          }).to raise_exception(ArgumentError)
         end
       end
 
@@ -234,7 +236,7 @@ def resulting_json
 
       it "inserts a comment" do
         r.comment "now pay attention"
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
         // now pay attention
         JSON
       end
@@ -252,7 +254,7 @@ def resulting_json
           r.element :name, "Fred"
           r.element :age, 36
         end
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
         {
           "name": "Fred",
           "age": 36
@@ -268,7 +270,7 @@ def resulting_json
             r.element :name
             r.element :age
           end
-          resulting_json.should == undent(<<-JSON)
+          expect(resulting_json).to eq undent(<<-JSON)
           {
             "name": "Fred",
             "age": 36
@@ -287,7 +289,7 @@ def resulting_json
           r.attribute :href, "http://example.com/authors/1"
           r.element :name, "Fred"
         end
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
         {
           "@href": "http://example.com/authors/1",
           "name": "Fred"
@@ -306,7 +308,7 @@ def resulting_json
           r.comment "age is irrelevant"
           r.element :age
         end
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
         {
           "name": "Fred",
           // age is irrelevant
@@ -325,7 +327,7 @@ def resulting_json
       r.element :user, Object.new do
         r.element :full_name, "Fred Bloggs"
       end
-      resulting_json.should == undent(<<-JSON)
+      expect(resulting_json).to eq undent(<<-JSON)
       {
         "full_name": "Fred Bloggs"
       }
@@ -342,7 +344,7 @@ def resulting_json
         r.attribute :alt_url, "http://xyz.com"
         r.element :full_name
       end
-      resulting_json.should == undent(<<-JSON)
+      expect(resulting_json).to eq undent(<<-JSON)
       {
         "@altUrl": "http://xyz.com",
         "fullName": "Fred Bloggs"
@@ -368,7 +370,7 @@ def resulting_json
           r.element :name
           r.element :age
         end
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
         [
            {
               "name": "Hewey",
@@ -391,7 +393,7 @@ def resulting_json
           r.element :name
           r.element :age
         end
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
         [
         \t{
         \t\t"name": "Hewey",
@@ -414,7 +416,7 @@ def resulting_json
           r.element :name
           r.element :age
         end
-        resulting_json.should == %([{"name":"Hewey","age":3},{"name":"Dewey","age":4}])
+        expect(resulting_json).to eq %([{"name":"Hewey","age":3},{"name":"Dewey","age":4}])
       end
 
     end

spec/representative/nokogiri_spec.rb

@@ -29,7 +29,7 @@ def resulting_xml
           r.element :person, @subject do
             r.attribute :name
           end
-          resulting_xml.should == %(<person name="Fred"/>)
+          expect(resulting_xml).to eq %(<person name="Fred"/>)
         end
       end
 
@@ -38,32 +38,32 @@ def resulting_xml
           r.element :person, @subject do
             r.attribute :lang, "fr"
           end
-          resulting_xml.should == %(<person lang="fr"/>)
+          expect(resulting_xml).to eq %(<person lang="fr"/>)
         end
       end
 
       describe "with a value that supports #to_proc" do
         it "calls the Proc on the subject to generate attribute value" do
           r.element :person, @subject do
-            r.attribute :name, lambda { |person| person.name.reverse } 
+            r.attribute :name, lambda { |person| person.name.reverse }
           end
-          resulting_xml.should == %(<person name="derF"/>)
+          expect(resulting_xml).to eq %(<person name="derF"/>)
         end
       end
 
       it "dasherizes the attribute name" do
         r.element :name do
           r.attribute :sourced_from, "phonebook"
         end
-        resulting_xml.should == %(<name sourced-from="phonebook"/>)
+        expect(resulting_xml).to eq %(<name sourced-from="phonebook"/>)
       end
 
       describe "with value nil" do
         it "omits the attribute" do
           r.element :person, @subject do
             r.attribute :name, nil
           end
-          resulting_xml.should == %(<person/>)
+          expect(resulting_xml).to eq %(<person/>)
         end
       end
 

spec/representative/tilt_integration_spec.rb

@@ -26,7 +26,7 @@ def resulting_xml
           r.element :foo, "bar"
         RUBY
         render
-        resulting_xml.should == %{<foo>bar</foo>\n}
+        expect(resulting_xml).to eq %{<foo>bar</foo>\n}
       end
 
       it "provides access to scope" do
@@ -43,7 +43,7 @@ def resulting_xml
         end
         render(scope)
 
-        resulting_xml.should == undent(<<-XML)
+        expect(resulting_xml).to eq undent(<<-XML)
           <author>
             <name>Mike</name>
           </author>
@@ -61,7 +61,7 @@ def resulting_xml
 
         render(Object.new, {:author => OpenStruct.new(:name => "Mike")})
 
-        resulting_xml.should == undent(<<-XML)
+        expect(resulting_xml).to eq undent(<<-XML)
           <author>
             <name>Mike</name>
           </author>
@@ -72,7 +72,7 @@ def resulting_xml
     end
 
   end
-  
+
   describe "JSON template" do
 
     def resulting_json
@@ -86,7 +86,7 @@ def resulting_json
         r.element :foo, "bar"
         RUBY
         render
-        resulting_json.should == %{"bar"\n}
+        expect(resulting_json).to eq %{"bar"\n}
       end
 
       it "provides access to scope" do
@@ -103,7 +103,7 @@ def resulting_json
         end
         render(scope)
 
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
           {
             "name": "Mike"
           }
@@ -121,7 +121,7 @@ def resulting_json
 
         render(Object.new, {:author => OpenStruct.new(:name => "Mike")})
 
-        resulting_json.should == undent(<<-JSON)
+        expect(resulting_json).to eq undent(<<-JSON)
           {
             "name": "Mike"
           }