deface 1.0.1 → 1.0.2

data/spec/deface/actions/remove_spec.rb

@@ -11,7 +11,7 @@ module Deface
         let(:source) { "<p>test</p><%= raw(text) %>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<%= raw(text) %>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<%= raw(text) %>")
         end
 
       end
@@ -21,7 +21,7 @@ module Deface
         let(:source) { "<h2>I should be safe</h2><span>Before!</span><h1>start</h1><p>some junk</p><div>more junk</div><h2>end</h2><span>After!</span>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<h2>I should be safe</h2><span>Before!</span><span>After!</span>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<h2>I should be safe</h2><span>Before!</span><span>After!</span>")
         end
       end
 

data/spec/deface/actions/replace_contents_spec.rb

@@ -11,7 +11,7 @@ module Deface
         let(:source) { "<p><span>Hello</span>I am not a <em>pirate</em></p>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<p><h1>Argh!</h1></p>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<p><h1>Argh!</h1></p>")
         end
       end
 
@@ -20,7 +20,7 @@ module Deface
         let(:source) { "<h1>start</h1><p>some junk</p><div>more junk</div><h2>end</h2>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<h1>start</h1><span>Argh!</span><h2>end</h2>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<h1>start</h1><span>Argh!</span><h2>end</h2>")
         end
       end
     end

data/spec/deface/actions/replace_spec.rb

@@ -11,8 +11,8 @@ module Deface
         let(:source) { "<p>test</p>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should  == "<h1>Argh!</h1>"
-          @override.failure.should be_false
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to  eq("<h1>Argh!</h1>")
+          expect(@override.failure).to be_falsy
         end
       end
 
@@ -21,8 +21,8 @@ module Deface
         let(:source) { "<h1>start</h1><p>some junk</p><div>more junk</div><h2>end</h2>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<span>Argh!</span>"
-          @override.failure.should be_false
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<span>Argh!</span>")
+          expect(@override.failure).to be_falsy
         end
       end
 
@@ -31,9 +31,9 @@ module Deface
         let(:source) { "<h1>start</h1><p>some junk</p><div>more junk</div><h2>end</h2>" }
 
         it "should log error and return unmodified source" do
-          Rails.logger.should_receive(:info).with(/failed to match with end selector/)
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == source
-          @override.failure.should be_true
+          expect(Rails.logger).to receive(:info).with(/failed to match with end selector/)
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq(source)
+          expect(@override.failure).to be_truthy
         end
       end
 
@@ -42,9 +42,9 @@ module Deface
         let(:source) { "<h1>start</h1><p>some junk</p><div>more junk</div><h2>end</h2>" }
 
         it "should log error and return unmodified source" do
-          Rails.logger.should_receive(:info).with(/failed to match with starting selector/)
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == source
-          @override.failure.should be_true
+          expect(Rails.logger).to receive(:info).with(/failed to match with starting selector/)
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq(source)
+          expect(@override.failure).to be_truthy
         end
       end
     end

data/spec/deface/actions/set_attributes_spec.rb

@@ -14,9 +14,9 @@ module Deface
         it "should return modified source" do
           attrs = attributes_to_sorted_array(Dummy.apply(source, {:virtual_path => "posts/index"}))
 
-          attrs["class"].value.should == "pretty"
-          attrs["alt"].value.should == "something interesting"
-          attrs["src"].value.should == "path/to/button.png"
+          expect(attrs["class"].value).to eq("pretty")
+          expect(attrs["alt"].value).to eq("something interesting")
+          expect(attrs["src"].value).to eq("path/to/button.png")
         end
       end
 
@@ -28,9 +28,9 @@ module Deface
         it "should return modified source" do
           attrs = attributes_to_sorted_array(Dummy.apply(source, {:virtual_path => "posts/index"}))
 
-          attrs["class"].value.should == "pretty"
-          attrs["alt"].value.should == "<%= something_interesting %>"
-          attrs["src"].value.should == "path/to/button.png"
+          expect(attrs["class"].value).to eq("pretty")
+          expect(attrs["alt"].value).to eq("<%= something_interesting %>")
+          expect(attrs["src"].value).to eq("path/to/button.png")
         end
       end
 
@@ -42,9 +42,9 @@ module Deface
         it "should return modified source" do
           attrs = attributes_to_sorted_array(Dummy.apply(source, {:virtual_path => "posts/index"}))
 
-          attrs["class"].value.should == "<%= get_some_other_class %>"
-          attrs["alt"].value.should == "something interesting"
-          attrs["src"].value.should == "path/to/button.png"
+          expect(attrs["class"].value).to eq("<%= get_some_other_class %>")
+          expect(attrs["alt"].value).to eq("something interesting")
+          expect(attrs["src"].value).to eq("path/to/button.png")
         end
       end
 
@@ -56,8 +56,8 @@ module Deface
         it "should return modified source" do
           tag = Nokogiri::HTML::DocumentFragment.parse(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", ""))
           tag = tag.css('img').first
-          tag.attributes['src'].value.should eq "path/to/button.png"
-          tag.attributes['class'].value.should eq "<%= hello_world %>"
+          expect(tag.attributes['src'].value).to eq "path/to/button.png"
+          expect(tag.attributes['class'].value).to eq "<%= hello_world %>"
         end
       end
     end

data/spec/deface/actions/surround_contents_spec.rb

@@ -11,7 +11,7 @@ module Deface
         let(:source) { "<h4>yay!</h4><div><p>test</p></div>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<h4>yay!</h4><div><span><p>test</p></span></div>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<h4>yay!</h4><div><span><p>test</p></span></div>")
         end
       end
 
@@ -20,7 +20,7 @@ module Deface
         let(:source) { "<p>test</p>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<p><% if 1==1 %>test<% end %></p>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<p><% if 1==1 %>test<% end %></p>")
         end
       end
 
@@ -30,7 +30,7 @@ module Deface
         let(:source) { "<div><h1>Start</h1><h2>middle</h2><h3>child</h3><p><span>This is the</span> end.</p></div>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '').should == "<div><h1>Start</h1><% if 1==1 %><h2>middle</h2><h3>child</h3><% end %><p><span>This is the</span> end.</p></div>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '')).to eq("<div><h1>Start</h1><% if 1==1 %><h2>middle</h2><h3>child</h3><% end %><p><span>This is the</span> end.</p></div>")
         end
       end
 
@@ -39,7 +39,7 @@ module Deface
         let(:source) { "<p>test</p>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<p><% if 1==1 %>test<% else %>test<% end %></p>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<p><% if 1==1 %>test<% else %>test<% end %></p>")
         end
       end
 
@@ -49,7 +49,7 @@ module Deface
         let(:source) { "<div><h1>Start</h1><h2>middle</h2><h3>child</h3><p><span>This is the</span> end.</p></div>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '').should == "<div><h1>Start</h1><% if 1==1 %><h2>middle</h2><h3>child</h3><% else %><h2>middle</h2><h3>child</h3><% end %><p><span>This is the</span> end.</p></div>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '')).to eq("<div><h1>Start</h1><% if 1==1 %><h2>middle</h2><h3>child</h3><% else %><h2>middle</h2><h3>child</h3><% end %><p><span>This is the</span> end.</p></div>")
         end
       end
     end

data/spec/deface/actions/surround_spec.rb

@@ -11,7 +11,7 @@ module Deface
         let(:source) { "<p>test</p>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<h1>It's behind you!</h1><div><p>test</p></div>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<h1>It's behind you!</h1><div><p>test</p></div>")
         end
       end
 
@@ -20,7 +20,7 @@ module Deface
         let(:source) { "<span><p>test</p></span>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '').should == "<span><% some_method('test') do %><p>test</p><% end %></span>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '')).to eq("<span><% some_method('test') do %><p>test</p><% end %></span>")
         end
       end
 
@@ -30,7 +30,7 @@ module Deface
         let(:source) { "<span><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p></span>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '').should == "<span><% some_method('test') do %><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p><% end %></span>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '')).to eq("<span><% some_method('test') do %><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p><% end %></span>")
         end
       end
 
@@ -39,7 +39,7 @@ module Deface
         let(:source) { "<p>test</p>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<div><p>test</p></div><h1>It's behind you!</h1><div><p>test</p></div>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<div><p>test</p></div><h1>It's behind you!</h1><div><p>test</p></div>")
         end
       end
 
@@ -49,7 +49,7 @@ module Deface
         let(:source) { "<span><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p></span>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '').should == "<span><% if true %><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p><% else %><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p><% end %></span>"
+          expect(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", '')).to eq("<span><% if true %><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p><% else %><h1>Start</h1><h2>middle</h2><p><span>This is the</span> end.</p><% end %></span>")
         end
       end
     end

data/spec/deface/applicator_spec.rb

@@ -15,7 +15,7 @@ module Deface
 
 
       it "should return unmodified source" do
-        Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<p>test</p><%= raw(text) %>"
+        expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<p>test</p><%= raw(text) %>")
       end
     end
 
@@ -25,7 +25,7 @@ module Deface
 
 
       it "should return modified source" do
-        Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<h1>World</h1><p>Hello</p><h1>World</h1>"
+        expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<h1>World</h1><p>Hello</p><h1>World</h1>")
       end
     end
 
@@ -36,7 +36,7 @@ module Deface
 
 
       it "should return modified source" do
-        Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<% if true %><p>True that!</p><% end %><h1>World</h1><% if true %><p>True that!</p><% end %><p>Hello</p>"
+        expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<% if true %><p>True that!</p><% end %><h1>World</h1><% if true %><p>True that!</p><% end %><p>Hello</p>")
       end
     end
 
@@ -46,7 +46,7 @@ module Deface
 
 
       it "should return modified source" do
-        Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<p>Hello</p><h1>World</h1>"
+        expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<p>Hello</p><h1>World</h1>")
       end
     end
 
@@ -57,7 +57,7 @@ module Deface
 
 
       it "should return modified source" do
-        Dummy.apply(source, {:virtual_path => "posts/index"}).should == "<% if true %><p>True that!</p><% end %><p>Hello</p>"
+        expect(Dummy.apply(source, {:virtual_path => "posts/index"})).to eq("<% if true %><p>True that!</p><% end %><p>Hello</p>")
       end
     end
 
@@ -71,7 +71,7 @@ module Deface
       let(:source) { "<ul><li>replaced</li></ul>" }
 
       it "should return modified source" do
-        Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", "").should == "<ul><li>first</li><li>second</li><li>third</li></ul>"
+        expect(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", "")).to eq("<ul><li>first</li><li>second</li><li>third</li></ul>")
       end
     end
 

data/spec/deface/dsl/context_spec.rb

@@ -9,7 +9,7 @@ describe Deface::DSL::Context do
     subject { context = Deface::DSL::Context.new('sample_name') }
 
     def override_should_be_created_with(expected_hash)
-      Deface::Override.should_receive(:new).with hash_including(expected_hash.reverse_merge(:name => 'sample_name'))
+      expect(Deface::Override).to receive(:new).with hash_including(expected_hash.reverse_merge(:name => 'sample_name'))
 
       subject.create_override
     end
@@ -38,14 +38,14 @@ describe Deface::DSL::Context do
         subject.insert_top('selector')
 
         logger = double('logger')
-        Rails.should_receive(:logger).and_return(logger)
-        logger.should_receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple action methods have been called. The last one will be used.")
+        expect(Rails).to receive(:logger).and_return(logger)
+        expect(logger).to receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple action methods have been called. The last one will be used.")
 
         subject.insert_bottom('selector')
       end
 
       it 'should use the last action that is specified' do
-        Rails.stub_chain(:logger, :error)
+        allow(Rails).to receive_message_chain(:logger, :error)
 
         subject.insert_top('insert_top/selector')
         subject.insert_bottom('insert_bottom/selector')
@@ -68,14 +68,14 @@ describe Deface::DSL::Context do
         subject.partial('partial name')
 
         logger = double('logger')
-        Rails.should_receive(:logger).and_return(logger)
-        logger.should_receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple source methods have been called. The last one will be used.")
+        expect(Rails).to receive(:logger).and_return(logger)
+        expect(logger).to receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple source methods have been called. The last one will be used.")
 
         subject.template('template/path')
       end
 
       it 'should use the last source that is specified' do
-        Rails.stub_chain(:logger, :error)
+        allow(Rails).to receive_message_chain(:logger, :error)
 
         subject.partial('partial name')
         subject.template('template/path')

data/spec/deface/dsl/loader_spec.rb

@@ -4,44 +4,42 @@ require 'deface/dsl/loader'
 
 describe Deface::DSL::Loader do
   context '.load' do
+    before { allow(File).to receive(:open) }
+
     context 'extension check' do
       it 'should succeed if file ends with .deface' do
         file = double('deface file')
-        filename = 'app/overrides/example_name.deface'
+        filename = 'app/overrides/my_view/example_name.deface'
 
-        lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
-          "Deface::DSL does not know how to read 'app/overrides/example_name.deface'. Override files should end with just .deface, .html.erb.deface, .html.haml.deface or .html.slim.deface")
+        expect { Deface::DSL::Loader.load(filename) }.not_to raise_error
       end
 
       it 'should succeed if file ends with .html.erb.deface' do
         file = double('deface file')
-        filename = 'app/overrides/example_name.html.erb.deface'
+        filename = 'app/overrides/my_view/example_name.html.erb.deface'
 
-        lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
-          "Deface::DSL does not know how to read 'app/overrides/example_name.html.erb.deface'. Override files should end with just .deface, .html.erb.deface, .html.haml.deface or .html.slim.deface")
+        expect { Deface::DSL::Loader.load(filename) }.not_to raise_error
       end
 
       it 'should succeed if file ends with .html.haml.deface' do
         file = double('deface file')
-        filename = 'app/overrides/example_name.html.haml.deface'
+        filename = 'app/overrides/my_view/example_name.html.haml.deface'
 
-        lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
-          "Deface::DSL does not know how to read 'app/overrides/example_name.html.haml.deface'. Override files should end with just .deface, .html.erb.deface, .html.haml.deface or .html.slim.deface")
+        expect { Deface::DSL::Loader.load(filename) }.not_to raise_error
       end
 
       it 'should succeed if file ends with .html.slim.deface' do
         file = double('deface file')
-        filename = 'app/overrides/example_name.html.slim.deface'
+        filename = 'app/overrides/my_view/example_name.html.slim.deface'
 
-        lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
-          "Deface::DSL does not know how to read 'app/overrides/example_name.html.slim.deface'. Override files should end with just .deface, .html.erb.deface, .html.haml.deface or .html.slim.deface")
+        expect { Deface::DSL::Loader.load(filename) }.not_to raise_error
       end
 
       it 'should fail if file ends with .blargh.deface' do
         file = double('deface file')
         filename = 'app/overrides/example_name.blargh.deface'
 
-        lambda { Deface::DSL::Loader.load(filename) }.should raise_error(
+        expect { Deface::DSL::Loader.load(filename) }.to raise_error(
           "Deface::DSL does not know how to read 'app/overrides/example_name.blargh.deface'. Override files should end with just .deface, .html.erb.deface, .html.haml.deface or .html.slim.deface")
       end
 
@@ -49,8 +47,7 @@ describe Deface::DSL::Loader do
         file = double('deface file')
         filename = 'app/overrides/parent.dir.with.dot/example_name.html.haml.deface'
 
-        lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
-          "Deface::DSL does not know how to read 'app/overrides/parent.dir.with.dot/example_name.html.haml.deface'. Override files should end with just .deface, .html.erb.deface, .html.haml.deface or .html.slim.deface")
+        expect { Deface::DSL::Loader.load(filename) }.not_to raise_error
       end
     end
 
@@ -58,26 +55,26 @@ describe Deface::DSL::Loader do
       file = double('html/erb/deface file')
       filename = 'app/overrides/example_name.html.erb.deface'
 
-      lambda { Deface::DSL::Loader.load(filename) }.should raise_error(
+      expect { Deface::DSL::Loader.load(filename) }.to raise_error(
         "Deface::DSL overrides must be in a sub-directory that matches the views virtual path. Move 'app/overrides/example_name.html.erb.deface' into a sub-directory.")
     end
 
     it 'should set the virtual_path for a .deface file in a directory below overrides' do
       file = double('deface file')
       filename = 'app/overrides/path/to/view/example_name.deface'
-      File.should_receive(:open).with(filename).and_yield(file)
+      expect(File).to receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
       context = double('dsl context')
-      Deface::DSL::Context.should_receive(:new).with(override_name).
+      expect(Deface::DSL::Context).to receive(:new).with(override_name).
         and_return(context)
 
       file_contents = double('file contents')
-      file.should_receive(:read).and_return(file_contents)
+      expect(file).to receive(:read).and_return(file_contents)
 
-      context.should_receive(:virtual_path).with('path/to/view').ordered
-      context.should_receive(:instance_eval).with(file_contents).ordered
-      context.should_receive(:create_override).ordered
+      expect(context).to receive(:virtual_path).with('path/to/view').ordered
+      expect(context).to receive(:instance_eval).with(file_contents).ordered
+      expect(context).to receive(:create_override).ordered
 
       Deface::DSL::Loader.load(filename)
     end
@@ -85,24 +82,24 @@ describe Deface::DSL::Loader do
     it 'should set the virtual_path for a .html.erb.deface file in a directory below overrides' do
       file = double('html/erb/deface file')
       filename = 'app/overrides/path/to/view/example_name.html.erb.deface'
-      File.should_receive(:open).with(filename).and_yield(file)
+      expect(File).to receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
       context = double('dsl context')
-      Deface::DSL::Context.should_receive(:new).with(override_name).
+      expect(Deface::DSL::Context).to receive(:new).with(override_name).
         and_return(context)
 
       file_contents = double('file contents')
-      file.should_receive(:read).and_return(file_contents)
+      expect(file).to receive(:read).and_return(file_contents)
 
-      Deface::DSL::Loader.should_receive(:extract_dsl_commands_from_erb).
+      expect(Deface::DSL::Loader).to receive(:extract_dsl_commands_from_erb).
         with(file_contents).
         and_return(['dsl commands', 'erb'])
 
-      context.should_receive(:virtual_path).with('path/to/view').ordered
-      context.should_receive(:instance_eval).with('dsl commands').ordered
-      context.should_receive(:erb).with('erb').ordered
-      context.should_receive(:create_override).ordered
+      expect(context).to receive(:virtual_path).with('path/to/view').ordered
+      expect(context).to receive(:instance_eval).with('dsl commands').ordered
+      expect(context).to receive(:erb).with('erb').ordered
+      expect(context).to receive(:create_override).ordered
 
       Deface::DSL::Loader.load(filename)
     end
@@ -110,24 +107,24 @@ describe Deface::DSL::Loader do
     it 'should set the virtual_path for a .html.haml.deface file in a directory below overrides' do
       file = double('html/haml/deface file')
       filename = 'app/overrides/path/to/view/example_name.html.haml.deface'
-      File.should_receive(:open).with(filename).and_yield(file)
+      expect(File).to receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
       context = double('dsl context')
-      Deface::DSL::Context.should_receive(:new).with(override_name).
+      expect(Deface::DSL::Context).to receive(:new).with(override_name).
         and_return(context)
 
       file_contents = double('file contents')
-      file.should_receive(:read).and_return(file_contents)
+      expect(file).to receive(:read).and_return(file_contents)
 
-      Deface::DSL::Loader.should_receive(:extract_dsl_commands_from_haml).
+      expect(Deface::DSL::Loader).to receive(:extract_dsl_commands_from_haml).
         with(file_contents).
         and_return(['dsl commands', 'haml'])
 
-      context.should_receive(:virtual_path).with('path/to/view').ordered
-      context.should_receive(:instance_eval).with('dsl commands').ordered
-      context.should_receive(:haml).with('haml').ordered
-      context.should_receive(:create_override).ordered
+      expect(context).to receive(:virtual_path).with('path/to/view').ordered
+      expect(context).to receive(:instance_eval).with('dsl commands').ordered
+      expect(context).to receive(:haml).with('haml').ordered
+      expect(context).to receive(:create_override).ordered
 
       Deface::DSL::Loader.load(filename)
     end
@@ -135,24 +132,24 @@ describe Deface::DSL::Loader do
     it 'should set the virtual_path for a .html.slim.deface file in a directory below overrides' do
       file = double('html/slim/deface file')
       filename = 'app/overrides/path/to/view/example_name.html.slim.deface'
-      File.should_receive(:open).with(filename).and_yield(file)
+      expect(File).to receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
       context = double('dsl context')
-      Deface::DSL::Context.should_receive(:new).with(override_name).
+      expect(Deface::DSL::Context).to receive(:new).with(override_name).
         and_return(context)
 
       file_contents = double('file contents')
-      file.should_receive(:read).and_return(file_contents)
+      expect(file).to receive(:read).and_return(file_contents)
 
-      Deface::DSL::Loader.should_receive(:extract_dsl_commands_from_slim).
+      expect(Deface::DSL::Loader).to receive(:extract_dsl_commands_from_slim).
         with(file_contents).
         and_return(['dsl commands', 'slim'])
 
-      context.should_receive(:virtual_path).with('path/to/view').ordered
-      context.should_receive(:instance_eval).with('dsl commands').ordered
-      context.should_receive(:slim).with('slim').ordered
-      context.should_receive(:create_override).ordered
+      expect(context).to receive(:virtual_path).with('path/to/view').ordered
+      expect(context).to receive(:instance_eval).with('dsl commands').ordered
+      expect(context).to receive(:slim).with('slim').ordered
+      expect(context).to receive(:create_override).ordered
 
       Deface::DSL::Loader.load(filename)
     end
@@ -161,7 +158,7 @@ describe Deface::DSL::Loader do
 
   context '.register' do
     it 'should register the deface extension with the polyglot library' do
-      Polyglot.should_receive(:register).with('deface', Deface::DSL::Loader)
+      expect(Polyglot).to receive(:register).with('deface', Deface::DSL::Loader)
 
       Deface::DSL::Loader.register
     end
@@ -171,64 +168,64 @@ describe Deface::DSL::Loader do
     it 'should work in the simplest case' do
       example = "<!-- test 'command' --><h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\ntest 'command'"
-      the_rest.should == "<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\ntest 'command'"
+      expect(the_rest).to eq "<h1>Wow!</h1>"
     end
 
     it 'should combine multiple comments' do
       example = "<!-- test 'command' --><!-- another 'command' --><h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\ntest 'command'\nanother 'command'"
-      the_rest.should == "<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\ntest 'command'\nanother 'command'"
+      expect(the_rest).to eq "<h1>Wow!</h1>"
     end
 
     it 'should leave internal comments alone' do
       example = "<br/><!-- test 'command' --><!-- another 'command' --><h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == ""
-      the_rest.should == example
+      expect(dsl_commands).to eq ""
+      expect(the_rest).to eq example
     end
 
     it 'should work with comments on own lines' do
       example = "<!-- test 'command' -->\n<!-- another 'command' -->\n<h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\ntest 'command'\nanother 'command'"
-      the_rest.should == "\n<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\ntest 'command'\nanother 'command'"
+      expect(the_rest).to eq "\n<h1>Wow!</h1>"
     end
 
     it 'should work with newlines inside the comment' do
       example = "<!--\n test 'command'\nanother 'command'\n -->\n<h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\ntest 'command'\nanother 'command'"
-      the_rest.should == "\n<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\ntest 'command'\nanother 'command'"
+      expect(the_rest).to eq "\n<h1>Wow!</h1>"
     end
 
     it 'should work with multiple commands on one line' do
       example = %q{<!-- replace_contents 'h1 .title' closing_selector "div#intro" disabled namespaced --><h1>Wow!</h1>}
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\nreplace_contents 'h1 .title'\nclosing_selector \"div#intro\"\ndisabled\nnamespaced"
-      the_rest.should == "<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\nreplace_contents 'h1 .title'\nclosing_selector \"div#intro\"\ndisabled\nnamespaced"
+      expect(the_rest).to eq "<h1>Wow!</h1>"
     end
 
     it 'should work with multiple commands on one line when command argument is not a normal string' do
       example = %q{<!-- replace_contents 'h1 .title' closing_selector %q{div#intro} disabled namespaced --><h1>Wow!</h1>}
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\nreplace_contents 'h1 .title'\nclosing_selector %q{div#intro}\ndisabled\nnamespaced"
-      the_rest.should == "<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\nreplace_contents 'h1 .title'\nclosing_selector %q{div#intro}\ndisabled\nnamespaced"
+      expect(the_rest).to eq "<h1>Wow!</h1>"
     end
 
     it 'should work with multiple commands on one line when command argument is an integer' do
       example = %q{<!-- replace_contents 'h1 .title' disabled sequence 2 namespaced --><h1>Wow!</h1>}
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\nreplace_contents 'h1 .title'\ndisabled\nsequence 2\nnamespaced"
-      the_rest.should == "<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\nreplace_contents 'h1 .title'\ndisabled\nsequence 2\nnamespaced"
+      expect(the_rest).to eq "<h1>Wow!</h1>"
     end
 
     it 'should work with multiple commands on one line when command argument is a hash' do
       example = %q{<!-- add_to_attributes 'h1 .title' attributes :class => 'pretty'--><h1>Wow!</h1>}
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "\nadd_to_attributes 'h1 .title'\nattributes :class => 'pretty'"
-      the_rest.should == "<h1>Wow!</h1>"
+      expect(dsl_commands).to eq "\nadd_to_attributes 'h1 .title'\nattributes :class => 'pretty'"
+      expect(the_rest).to eq "<h1>Wow!</h1>"
     end
   end
 
@@ -236,22 +233,22 @@ describe Deface::DSL::Loader do
     it 'should work in the simplest case' do
       example = "/ test 'command'\n/ another 'command'\n%h1 Wow!"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_haml(example)
-      dsl_commands.should == "test 'command'\nanother 'command'\n"
-      the_rest.should == "%h1 Wow!"
+      expect(dsl_commands).to eq "test 'command'\nanother 'command'\n"
+      expect(the_rest).to eq "%h1 Wow!"
     end
 
     it 'should work with a block style comment using spaces' do
       example = "/\n  test 'command'\n  another 'command'\n%h1 Wow!"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_haml(example)
-      dsl_commands.should == "\ntest 'command'\nanother 'command'\n"
-      the_rest.should == "%h1 Wow!"
+      expect(dsl_commands).to eq "\ntest 'command'\nanother 'command'\n"
+      expect(the_rest).to eq "%h1 Wow!"
     end
 
     it 'should leave internal comments alone' do
       example = "%br\n/ test 'command'\n/ another 'command'\n%h1 Wow!"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == ""
-      the_rest.should == example
+      expect(dsl_commands).to eq ""
+      expect(the_rest).to eq example
     end
   end
 
@@ -259,22 +256,22 @@ describe Deface::DSL::Loader do
     it 'should work in the simplest case' do
       example = "/ test 'command'\n/ another 'command'\nh1 Wow!"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_slim(example)
-      dsl_commands.should == "test 'command'\nanother 'command'\n"
-      the_rest.should == "h1 Wow!"
+      expect(dsl_commands).to eq "test 'command'\nanother 'command'\n"
+      expect(the_rest).to eq "h1 Wow!"
     end
 
     it 'should work with a block style comment using spaces' do
       example = "/\n  test 'command'\n  another 'command'\nh1 Wow!"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_slim(example)
-      dsl_commands.should == "\ntest 'command'\nanother 'command'\n"
-      the_rest.should == "h1 Wow!"
+      expect(dsl_commands).to eq "\ntest 'command'\nanother 'command'\n"
+      expect(the_rest).to eq "h1 Wow!"
     end
 
     it 'should leave internal comments alone' do
       example = "br\n/ test 'command'\n/ another 'command'\nh1 Wow!"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == ""
-      the_rest.should == example
+      expect(dsl_commands).to eq ""
+      expect(the_rest).to eq example
     end
   end
 end