yard 0.8.7.6 → 0.9.0

data/spec/cli/stats_spec.rb

@@ -26,14 +26,14 @@ describe YARD::CLI::Stats do
 
     @output = StringIO.new
     @stats = CLI::Stats.new(false)
-    @stats.stub!(:support_rdoc_document_file!).and_return([])
-    @stats.stub!(:yardopts).and_return([])
-    log.stub!(:puts) {|*args| @output << args.join("\n") << "\n" }
+    allow(@stats).to receive(:support_rdoc_document_file!).and_return([])
+    allow(@stats).to receive(:yardopts).and_return([])
+    allow(log).to receive(:puts) {|*args| @output << args.join("\n") << "\n" }
   end
 
-  it "should list undocumented objects with --list-undoc" do
+  it "lists undocumented objects with --list-undoc when there are undocumented objects" do
     @stats.run('--list-undoc')
-    @output.string.should == <<-eof
+    expect(@output.string).to eq <<-eof
 #{@main_stats}
 Undocumented Objects:
 
@@ -45,14 +45,14 @@ A#foo
 eof
   end
 
-  it "should list no undocumented objects with --list-undoc when objects are undocumented" do
+  it "lists no undocumented objects with --list-undoc when there is nothing undocumented" do
     Registry.clear
     YARD.parse_string <<-eof
       # documentation
       def foo; end
     eof
     @stats.run('--list-undoc')
-    @output.string.should ==  "Files:           1\n" +
+    expect(@output.string).to eq "Files:           1\n" +
                               "Modules:         0 (    0 undocumented)\n" +
                               "Classes:         0 (    0 undocumented)\n" +
                               "Constants:       0 (    0 undocumented)\n" +
@@ -60,9 +60,9 @@ eof
                               " 100.00% documented\n"
   end
 
-  it "should list undocumented objects in compact mode with --list-undoc --compact" do
+  it "lists undocumented objects in compact mode with --list-undoc --compact" do
     @stats.run('--list-undoc', '--compact')
-    @output.string.should == <<-eof
+    expect(@output.string).to eq <<-eof
 #{@main_stats}
 Undocumented Objects:
 B            ((stdin):9)
@@ -72,19 +72,19 @@ A#foo        ((stdin):4)
 eof
   end
 
-  it "should still list stats with --quiet" do
+  it "still lists stats with --quiet" do
     @stats.run('--quiet')
-    @output.string.should == @main_stats
+    expect(@output.string).to eq @main_stats
   end
 
-  it "should ignore everything with --no-public" do
+  it "ignores everything with --no-public" do
     @stats.run('--no-public')
-    @output.string.should ==
+    expect(@output.string).to eq(
       "Files:           0\n" +
       "Modules:         0 (    0 undocumented)\n" +
       "Classes:         0 (    0 undocumented)\n" +
       "Constants:       0 (    0 undocumented)\n" +
       "Methods:         0 (    0 undocumented)\n" +
-      " 100.00% documented\n"
+      " 100.00% documented\n")
   end
 end

data/spec/cli/yardoc_spec.rb

@@ -7,290 +7,290 @@ describe YARD::CLI::Yardoc do
     @yardoc.use_document_file = false
     @yardoc.use_yardopts_file = false
     @yardoc.generate = false
-    Templates::Engine.stub!(:render)
-    Templates::Engine.stub!(:generate)
-    YARD.stub!(:parse)
-    Registry.stub!(:load)
-    Registry.stub!(:save)
+    allow(Templates::Engine).to receive(:render)
+    allow(Templates::Engine).to receive(:generate)
+    allow(YARD).to receive(:parse)
+    allow(Registry).to receive(:load)
+    allow(Registry).to receive(:save)
   end
 
-  describe 'Defaults' do
+  describe "Defaults" do
     before do
       @yardoc = CLI::Yardoc.new
-      @yardoc.stub!(:yardopts).and_return([])
-      @yardoc.stub!(:support_rdoc_document_file!).and_return([])
+      allow(@yardoc).to receive(:yardopts).and_return([])
+      allow(@yardoc).to receive(:support_rdoc_document_file!).and_return([])
       @yardoc.parse_arguments
     end
 
-    it "should use cache by default" do
-      @yardoc.use_cache.should == false
+    it "does not use cache by default" do
+      expect(@yardoc.use_cache).to be false
     end
 
-    it "print statistics by default" do
-      @yardoc.statistics.should == true
+    it "prints statistics by default" do
+      expect(@yardoc.statistics).to be true
     end
 
-    it "should generate output by default" do
-      @yardoc.generate.should == true
+    it "generates output by default" do
+      expect(@yardoc.generate).to be true
     end
 
-    it "should read .yardopts by default" do
-      @yardoc.use_yardopts_file.should == true
+    it "reads .yardopts by default" do
+      expect(@yardoc.use_yardopts_file).to be true
     end
 
-    it "should read .document by default" do
-      @yardoc.use_document_file.should == true
+    it "reads .document by default" do
+      expect(@yardoc.use_document_file).to be true
     end
 
-    it "should use {lib,app}/**/*.rb and ext/**/*.c as default file glob" do
-      @yardoc.files.should == ['{lib,app}/**/*.rb', 'ext/**/*.c']
+    it "uses lib, app, and ext as default file glob paths" do
+      expect(@yardoc.files).to eq Parser::SourceParser::DEFAULT_PATH_GLOB
     end
 
-    it "should use rdoc as default markup type (but falls back on none)" do
-      @yardoc.options.markup.should == :rdoc
+    it "uses rdoc as default markup type (but falls back on none)" do
+      expect(@yardoc.options.markup).to eq :rdoc
     end
 
-    it "should use default as default template" do
-      @yardoc.options.template.should == :default
+    it "uses default as default template" do
+      expect(@yardoc.options.template).to eq :default
     end
 
-    it "should use HTML as default format" do
-      @yardoc.options.format.should == :html
+    it "uses HTML as default format" do
+      expect(@yardoc.options.format).to eq :html
     end
 
-    it "should use 'Object' as default return type" do
-      @yardoc.options.default_return.should == 'Object'
+    it "uses 'Object' as default return type" do
+      expect(@yardoc.options.default_return).to eq 'Object'
     end
 
-    it "should not hide void return types by default" do
-      @yardoc.options.hide_void_return.should == false
+    it "does not hide void return types by default" do
+      expect(@yardoc.options.hide_void_return).to be false
     end
 
-    it "should only show public visibility by default" do
-      @yardoc.visibilities.should == [:public]
+    it "only shows public visibility by default" do
+      expect(@yardoc.visibilities).to eq [:public]
     end
 
-    it "should not list objects by default" do
-      @yardoc.list.should == false
+    it "does not list objects by default" do
+      expect(@yardoc.list).to be false
     end
 
-    it "should not embed mixins by default" do
-      @yardoc.options.embed_mixins.should be_empty
+    it "does not embed mixins by default" do
+      expect(@yardoc.options.embed_mixins).to be_empty
     end
 
-    it "should not set any locale by default" do
-      @yardoc.options.locale.should be_nil
+    it "does not set any locale by default" do
+      expect(@yardoc.options.locale).to be nil
     end
   end
 
-  describe 'General options' do
+  describe "General options" do
     def self.should_accept(*args, &block)
       @counter ||= 0
       @counter += 1
       counter = @counter
       args.each do |arg|
         define_method("test_options_#{@counter}", &block)
-        it("should accept #{arg}") { send("test_options_#{counter}", arg) }
+        it("accepts #{arg}") { send("test_options_#{counter}", arg) }
       end
     end
 
     should_accept('--single-db') do |arg|
       @yardoc.parse_arguments(arg)
-      Registry.single_object_db.should == true
+      expect(Registry.single_object_db).to be true
       Registry.single_object_db = nil
     end
 
     should_accept('--no-single-db') do |arg|
       @yardoc.parse_arguments(arg)
-      Registry.single_object_db.should == false
+      expect(Registry.single_object_db).to be false
       Registry.single_object_db = nil
     end
 
     should_accept('-c', '--use-cache') do |arg|
       @yardoc.parse_arguments(arg)
-      @yardoc.use_cache.should == true
+      expect(@yardoc.use_cache).to be true
     end
 
     should_accept('--no-cache') do |arg|
       @yardoc.parse_arguments(arg)
-      @yardoc.use_cache.should == false
+      expect(@yardoc.use_cache).to be false
     end
 
     should_accept('--yardopts') do |arg|
       @yardoc = CLI::Yardoc.new
       @yardoc.use_document_file = false
-      @yardoc.should_receive(:yardopts).at_least(1).times.and_return([])
+      expect(@yardoc).to receive(:yardopts).at_least(1).times.and_return([])
       @yardoc.parse_arguments(arg)
-      @yardoc.use_yardopts_file.should == true
+      expect(@yardoc.use_yardopts_file).to be true
       @yardoc.parse_arguments('--no-yardopts', arg)
-      @yardoc.use_yardopts_file.should == true
+      expect(@yardoc.use_yardopts_file).to be true
     end
 
     should_accept('--yardopts with filename') do |arg|
       @yardoc = CLI::Yardoc.new
-      File.should_receive(:read_binary).with('.foobar').and_return('')
+      expect(File).to receive(:read_binary).with('.foobar').and_return('')
       @yardoc.use_document_file = false
       @yardoc.parse_arguments('--yardopts', '.foobar')
-      @yardoc.use_yardopts_file.should == true
-      @yardoc.options_file.should == '.foobar'
+      expect(@yardoc.use_yardopts_file).to be true
+      expect(@yardoc.options_file).to eq '.foobar'
     end
 
     should_accept('--no-yardopts') do |arg|
       @yardoc = CLI::Yardoc.new
       @yardoc.use_document_file = false
-      @yardoc.should_not_receive(:yardopts)
+      expect(@yardoc).not_to receive(:yardopts)
       @yardoc.parse_arguments(arg)
-      @yardoc.use_yardopts_file.should == false
+      expect(@yardoc.use_yardopts_file).to be false
       @yardoc.parse_arguments('--yardopts', arg)
-      @yardoc.use_yardopts_file.should == false
+      expect(@yardoc.use_yardopts_file).to be false
     end
 
     should_accept('--document') do |arg|
       @yardoc = CLI::Yardoc.new
       @yardoc.use_yardopts_file = false
-      @yardoc.should_receive(:support_rdoc_document_file!).and_return([])
+      expect(@yardoc).to receive(:support_rdoc_document_file!).and_return([])
       @yardoc.parse_arguments('--no-document', arg)
-      @yardoc.use_document_file.should == true
+      expect(@yardoc.use_document_file).to be true
     end
 
     should_accept('--no-document') do |arg|
       @yardoc = CLI::Yardoc.new
       @yardoc.use_yardopts_file = false
-      @yardoc.should_not_receive(:support_rdoc_document_file!)
+      expect(@yardoc).not_to receive(:support_rdoc_document_file!)
       @yardoc.parse_arguments('--document', arg)
-      @yardoc.use_document_file.should == false
+      expect(@yardoc.use_document_file).to be false
     end
 
     should_accept('-b', '--db') do |arg|
       @yardoc.parse_arguments(arg, 'test')
-      Registry.yardoc_file.should == 'test'
+      expect(Registry.yardoc_file).to eq 'test'
       Registry.yardoc_file = '.yardoc'
     end
 
     should_accept('-n', '--no-output') do |arg|
-      Templates::Engine.should_not_receive(:generate)
+      expect(Templates::Engine).not_to receive(:generate)
       @yardoc.run(arg)
     end
 
     should_accept('--exclude') do |arg|
-      YARD.should_receive(:parse).with(['a'], ['nota', 'b'])
+      expect(YARD).to receive(:parse).with(['a'], ['nota', 'b'])
       @yardoc.run(arg, 'nota', arg, 'b', 'a')
     end
 
     should_accept('--no-save') do |arg|
-      YARD.should_receive(:parse)
-      Registry.should_not_receive(:save)
+      expect(YARD).to receive(:parse)
+      expect(Registry).not_to receive(:save)
       @yardoc.run(arg)
     end
   end
 
-  describe 'Output options' do
-    it "should accept --title" do
+  describe "Output options" do
+    it "accepts --title" do
       @yardoc.parse_arguments('--title', 'hello world')
-      @yardoc.options.title.should == 'hello world'
+      expect(@yardoc.options.title).to eq 'hello world'
     end
 
-    it "should allow --title to have multiple spaces in .yardopts" do
-      File.should_receive(:read_binary).with("test").and_return("--title \"Foo Bar\"")
+    it "allows --title to have multiple spaces in .yardopts" do
+      expect(File).to receive(:read_binary).with("test").and_return("--title \"Foo Bar\"")
       @yardoc.options_file = "test"
       @yardoc.use_yardopts_file = true
       @yardoc.run
-      @yardoc.options.title.should == "Foo Bar"
+      expect(@yardoc.options.title).to eq "Foo Bar"
     end
 
-    it "should alias --main to the --readme flag" do
+    it "aliases --main to the --readme flag" do
       readme = File.join(File.dirname(__FILE__),'..','..','README.md')
 
       @yardoc.parse_arguments('--main', readme)
-      @yardoc.options.readme.should == CodeObjects::ExtraFileObject.new(readme, '')
+      expect(@yardoc.options.readme).to eq CodeObjects::ExtraFileObject.new(readme, '')
     end
 
-    it "should select a markup provider when --markup-provider or -mp is set" do
+    it "selects a markup provider when --markup-provider or -mp is set" do
       @yardoc.parse_arguments("-M", "test")
-      @yardoc.options.markup_provider.should == :test
+      expect(@yardoc.options.markup_provider).to eq :test
       @yardoc.parse_arguments("--markup-provider", "test2")
-      @yardoc.options.markup_provider.should == :test2
+      expect(@yardoc.options.markup_provider).to eq :test2
     end
 
-    it "should select a markup format when -m is set" do
-      @yardoc.should_receive(:verify_markup_options).and_return(true)
+    it "selects a markup format when -m is set" do
+      expect(@yardoc).to receive(:verify_markup_options).and_return(true)
       @yardoc.generate = true
       @yardoc.parse_arguments('-m', 'markdown')
-      @yardoc.options.markup.should == :markdown
+      expect(@yardoc.options.markup).to eq :markdown
     end
 
-    it "should accept --default-return" do
+    it "accepts --default-return" do
       @yardoc.parse_arguments *%w( --default-return XYZ )
-      @yardoc.options.default_return.should == "XYZ"
+      expect(@yardoc.options.default_return).to eq "XYZ"
     end
 
-    it "should allow --hide-void-return to be set" do
+    it "allows --hide-void-return to be set" do
       @yardoc.parse_arguments *%w( --hide-void-return )
-      @yardoc.options.hide_void_return.should be_true
+      expect(@yardoc.options.hide_void_return).to be true
     end
 
-    it "should accept --embed-mixins" do
+    it "accepts --embed-mixins" do
       @yardoc.parse_arguments *%w( --embed-mixins )
-      @yardoc.options.embed_mixins.should == ['*']
+      expect(@yardoc.options.embed_mixins).to eq ['*']
     end
 
-    it "should accept --embed-mixin MODULE" do
+    it "accepts --embed-mixin MODULE" do
       @yardoc.parse_arguments *%w( --embed-mixin MyModule )
-      @yardoc.options.embed_mixins.should == ['MyModule']
+      expect(@yardoc.options.embed_mixins).to eq ['MyModule']
     end
 
-    it "should generate all objects with --use-cache" do
-      YARD.should_receive(:parse)
-      Registry.should_receive(:load)
-      Registry.should_receive(:load_all)
-      @yardoc.stub!(:generate).and_return(true)
+    it "generates all objects with --use-cache" do
+      expect(YARD).to receive(:parse)
+      expect(Registry).to receive(:load)
+      expect(Registry).to receive(:load_all)
+      allow(@yardoc).to receive(:generate).and_return(true)
       @yardoc.run *%w( --use-cache )
     end
 
-    it "should not print statistics with --no-stats" do
-      @yardoc.stub!(:statistics).and_return(false)
-      CLI::Stats.should_not_receive(:new)
+    it "does not print statistics with --no-stats" do
+      allow(@yardoc).to receive(:statistics).and_return(false)
+      expect(CLI::Stats).not_to receive(:new)
       @yardoc.run *%w( --no-stats )
     end
 
-    describe '--asset' do
+    describe "--asset" do
       before do
         @yardoc.generate = true
-        @yardoc.stub!(:run_generate)
+        allow(@yardoc).to receive(:run_generate)
       end
 
-      it "should copy assets to output directory" do
-        FileUtils.should_receive(:cp_r).with('a', 'doc/a')
+      it "copies assets to output directory" do
+        expect(FileUtils).to receive(:cp_r).with('a', 'doc/a')
         @yardoc.run *%w( --asset a )
-        @yardoc.assets.should == {'a' => 'a'}
+        expect(@yardoc.assets).to eq({'a' => 'a'})
       end
 
-      it "should allow multiple --asset options" do
-        FileUtils.should_receive(:cp_r).with('a', 'doc/a')
-        FileUtils.should_receive(:cp_r).with('b', 'doc/b')
+      it "allows multiple --asset options" do
+        expect(FileUtils).to receive(:cp_r).with('a', 'doc/a')
+        expect(FileUtils).to receive(:cp_r).with('b', 'doc/b')
         @yardoc.run *%w( --asset a --asset b )
-        @yardoc.assets.should == {'a' => 'a', 'b' => 'b'}
+        expect(@yardoc.assets).to eq({'a' => 'a', 'b' => 'b'})
       end
 
-      it "should not allow from or to to refer to a path above current path" do
-        log.should_receive(:warn).exactly(4).times.with(/invalid/i)
+      it "does not allow from or to to refer to a path above current path" do
+        expect(log).to receive(:warn).exactly(4).times.with(/invalid/i)
         @yardoc.run *%w( --asset ../../../etc/passwd )
-        @yardoc.assets.should be_empty
+        expect(@yardoc.assets).to be_empty
         @yardoc.run *%w( --asset a/b/c/d/../../../../../../etc/passwd )
-        @yardoc.assets.should be_empty
+        expect(@yardoc.assets).to be_empty
         @yardoc.run *%w( --asset /etc/passwd )
-        @yardoc.assets.should be_empty
+        expect(@yardoc.assets).to be_empty
         @yardoc.run *%w( --asset normal:/etc/passwd )
-        @yardoc.assets.should be_empty
+        expect(@yardoc.assets).to be_empty
       end
 
-      it "should allow from:to syntax" do
-        FileUtils.should_receive(:cp_r).with('foo', 'doc/bar')
+      it "allows from:to syntax" do
+        expect(FileUtils).to receive(:cp_r).with('foo', 'doc/bar')
         @yardoc.run *%w( --asset foo:bar )
-        @yardoc.assets.should == {'foo' => 'bar'}
+        expect(@yardoc.assets).to eq({'foo' => 'bar'})
       end
 
-      it "should not put from inside of to/ if from is a directory" do
+      it "does not put from inside of to/ if from is a directory" do
         begin
           from = 'tmp_foo'
           to = 'tmp_bar'
@@ -299,8 +299,8 @@ describe YARD::CLI::Yardoc do
           @yardoc.options.serializer.basepath = File.dirname(__FILE__)
           @yardoc.run("--asset", "#{from}:#{to}")
           @yardoc.run("--asset", "#{from}:#{to}")
-          File.directory?(full_to).should be_true
-          File.directory?(File.join(full_to, 'tmp_foo')).should be_false
+          expect(File.directory?(full_to)).to be true
+          expect(File.directory?(File.join(full_to, 'tmp_foo'))).to be false
         ensure
           FileUtils.rm_rf(from)
           FileUtils.rm_rf(full_to)
@@ -308,37 +308,37 @@ describe YARD::CLI::Yardoc do
       end
     end
 
-    describe '--locale' do
-      it 'should apply specified locale to all extra file objects' do
-        File.stub!(:read).with('extra_file1').and_return('')
-        File.stub!(:read).with('extra_file2').and_return('')
+    describe "--locale" do
+      it "applies specified locale to all extra file objects" do
+        allow(File).to receive(:read).with('extra_file1').and_return('')
+        allow(File).to receive(:read).with('extra_file2').and_return('')
 
         extra_file_object1 = CodeObjects::ExtraFileObject.new('extra_file1')
         extra_file_object2 = CodeObjects::ExtraFileObject.new('extra_file2')
-        extra_file_object1.should_receive(:locale=).with('fr')
-        extra_file_object2.should_receive(:locale=).with('fr')
-
-        CodeObjects::ExtraFileObject.stub!(:new).with('extra_file1').and_return(extra_file_object1)
-        CodeObjects::ExtraFileObject.stub!(:new).with('extra_file2').and_return(extra_file_object2)
-        Dir.stub!(:glob).with('README{,*[^~]}').and_return([])
-        File.stub!(:file?).with('extra_file1').and_return(true)
-        File.stub!(:file?).with('extra_file2').and_return(true)
+        expect(extra_file_object1).to receive(:locale=).with('fr')
+        expect(extra_file_object2).to receive(:locale=).with('fr')
+
+        allow(CodeObjects::ExtraFileObject).to receive(:new).with('extra_file1').and_return(extra_file_object1)
+        allow(CodeObjects::ExtraFileObject).to receive(:new).with('extra_file2').and_return(extra_file_object2)
+        allow(Dir).to receive(:glob).with('README{,*[^~]}').and_return([])
+        allow(File).to receive(:file?).with('extra_file1').and_return(true)
+        allow(File).to receive(:file?).with('extra_file2').and_return(true)
         @yardoc.run('--locale=fr', '-', 'extra_file1', 'extra_file2')
       end
     end
 
-    describe '--po-dir' do
-      it 'should set Registry.po_dir' do
-        Registry.should_receive(:po_dir=).with("locale")
+    describe "--po-dir" do
+      it "sets Registry.po_dir" do
+        expect(Registry).to receive(:po_dir=).with("locale")
         @yardoc.run('--po-dir=locale')
       end
     end
   end
 
-  describe '--[no-]api' do
+  describe "--[no-]api" do
     before { Registry.clear }
 
-    it "should allow --api name" do
+    it "allows --api name" do
       YARD.parse_string <<-eof
         # @api private
         class Foo; end
@@ -347,10 +347,10 @@ describe YARD::CLI::Yardoc do
         class Baz; end
       eof
       @yardoc.run('--api', 'private')
-      @yardoc.options.verifier.run(Registry.all).should == [P('Foo')]
+      expect(@yardoc.options.verifier.run(Registry.all)).to eq [P('Foo')]
     end
 
-    it "should allow multiple --api's to all be shown" do
+    it "allows multiple --api's to all be shown" do
       YARD.parse_string <<-eof
         # @api private
         class Foo; end
@@ -359,11 +359,11 @@ describe YARD::CLI::Yardoc do
         class Baz; end
       eof
       @yardoc.run('--api', 'private', '--api', 'public')
-      @yardoc.options.verifier.run(Registry.all).
-        sort_by {|o| o.path }.should == [P('Bar'), P('Foo')]
+      expect(@yardoc.options.verifier.run(Registry.all).
+        sort_by {|o| o.path }).to eq [P('Bar'), P('Foo')]
     end
 
-    it "should allow --no-api to specify objects with no @api tag" do
+    it "allows --no-api to specify objects with no @api tag" do
       YARD.parse_string <<-eof
         # @api private
         class Foo; end
@@ -372,13 +372,13 @@ describe YARD::CLI::Yardoc do
         class Baz; end
       eof
       @yardoc.run('--api', '')
-      @yardoc.options.verifier.run(Registry.all).should == [P('Baz')]
+      expect(@yardoc.options.verifier.run(Registry.all)).to eq [P('Baz')]
       @yardoc.options.verifier = Verifier.new
       @yardoc.run('--no-api')
-      @yardoc.options.verifier.run(Registry.all).should == [P('Baz')]
+      expect(@yardoc.options.verifier.run(Registry.all)).to eq [P('Baz')]
     end
 
-    it "should allow --no-api to work with other --api switches" do
+    it "allows --no-api to work with other --api switches" do
       YARD.parse_string <<-eof
         # @api private
         class Foo; end
@@ -387,21 +387,21 @@ describe YARD::CLI::Yardoc do
         class Baz; end
       eof
       @yardoc.run('--no-api', '--api', 'public')
-      @yardoc.options.verifier.run(Registry.all).
-        sort_by {|o| o.path }.should == [P('Bar'), P('Baz')]
+      expect(@yardoc.options.verifier.run(Registry.all).
+        sort_by {|o| o.path }).to eq [P('Bar'), P('Baz')]
     end
 
-    it "should ensure Ruby code cannot be used" do
+    it "ensures Ruby code cannot be used" do
       [':symbol', '42', '"; exit'].each do |ruby|
         @yardoc.options.verifier.expressions = []
         @yardoc.run('--api', ruby)
-        @yardoc.options.verifier.expressions[1].should include(ruby.inspect)
+        expect(@yardoc.options.verifier.expressions[1]).to include(ruby.inspect)
       end
     end
   end
 
-  describe '--hide-api option' do
-    it "should allow --hide-api to hide objects with api tags" do
+  describe "--hide-api option" do
+    it "allows --hide-api to hide objects with api tags" do
       YARD.parse_string <<-eof
         # @api private
         class Foo; end
@@ -409,11 +409,11 @@ describe YARD::CLI::Yardoc do
         class Baz; end
       eof
       @yardoc.run('--hide-api', 'private')
-      @yardoc.options.verifier.run(Registry.all).
-        sort_by {|o| o.path }.should == [P('Bar'), P('Baz')]
+      expect(@yardoc.options.verifier.run(Registry.all).
+        sort_by {|o| o.path }).to eq [P('Bar'), P('Baz')]
     end
 
-    it "should allow --hide-api to work with --api" do
+    it "allows --hide-api to work with --api" do
       YARD.parse_string <<-eof
         # @api private
         class Foo; end
@@ -422,59 +422,54 @@ describe YARD::CLI::Yardoc do
         class Baz; end
       eof
       @yardoc.run('--api', 'public', '--hide-api', 'private')
-      @yardoc.options.verifier.run(Registry.all).
-        sort_by {|o| o.path }.should == [P('Bar')]
+      expect(@yardoc.options.verifier.run(Registry.all).
+        sort_by {|o| o.path }).to eq [P('Bar')]
     end
   end
 
-  describe '--no-private option' do
-    it "should accept --no-private" do
-      obj = mock(:object)
-      obj.should_receive(:tag).ordered.with(:private).and_return(true)
+  describe "--no-private option" do
+    it "accepts --no-private" do
+      obj = double(:object)
+      expect(obj).to receive(:tag).ordered.with(:private).and_return(true)
       @yardoc.parse_arguments *%w( --no-private )
-      @yardoc.options.verifier.call(obj).should == false
+      expect(@yardoc.options.verifier.call(obj)).to be false
     end
 
-    it "should hide object if namespace is @private with --no-private" do
-      ns = mock(:namespace)
-      ns.stub!(:type).and_return(:module)
-      ns.should_receive(:tag).with(:private).and_return(true)
-      obj = mock(:object)
-      obj.stub!(:namespace).and_return(ns)
-      obj.should_receive(:tag).with(:private).and_return(false)
+    it "hides object if namespace is @private with --no-private" do
+      ns = double(:namespace, :type => :module)
+      expect(ns).to receive(:tag).with(:private).and_return(true)
+      obj = double(:object, :namespace => ns)
+      expect(obj).to receive(:tag).with(:private).and_return(false)
       @yardoc.parse_arguments *%w( --no-private )
-      @yardoc.options.verifier.call(obj).should == false
-    end
-
-    it "should not call #tag on namespace if namespace is proxy with --no-private" do
-      ns = mock(:namespace)
-      ns.should_receive(:is_a?).with(CodeObjects::Proxy).and_return(true)
-      ns.should_not_receive(:tag)
-      obj = mock(:object)
-      obj.stub!(:type).and_return(:class)
-      obj.stub!(:namespace).and_return(ns)
-      obj.stub!(:visibility).and_return(:public)
-      obj.should_receive(:tag).ordered.with(:private).and_return(false)
+      expect(@yardoc.options.verifier.call(obj)).to be false
+    end
+
+    it "does not call #tag on namespace if namespace is proxy with --no-private" do
+      ns = double(:namespace)
+      expect(ns).to receive(:is_a?).with(CodeObjects::Proxy).and_return(true)
+      expect(ns).not_to receive(:tag)
+      obj = double(:object, :type => :class, :namespace => ns, :visibility => :public)
+      expect(obj).to receive(:tag).ordered.with(:private).and_return(false)
       @yardoc.parse_arguments *%w( --no-private )
-      @yardoc.options.verifier.call(obj).should == true
+      expect(@yardoc.options.verifier.call(obj)).to be true
     end
 
     # @bug gh-197
-    it "should not call #tag on namespace if namespace is proxy with --no-private" do
+    it "does not call #tag on namespace if namespace is proxy with --no-private" do
       Registry.clear
       YARD.parse_string "module Qux; class Foo::Bar; end; end"
       foobar = Registry.at('Foo::Bar')
       foobar.namespace.type = :module
       @yardoc.parse_arguments *%w( --no-private )
-      @yardoc.options.verifier.call(foobar).should == true
+      expect(@yardoc.options.verifier.call(foobar)).to be true
     end
 
-    it "should not call #tag on proxy object" do # @bug gh-197
+    it "does not call #tag on proxy object" do # @bug gh-197
       @yardoc.parse_arguments *%w( --no-private )
-      @yardoc.options.verifier.call(P('ProxyClass')).should == true
+      expect(@yardoc.options.verifier.call(P('ProxyClass'))).to be true
     end
 
-    it "should hide methods inside a 'private' class/module with --no-private" do
+    it "hides methods inside a 'private' class/module with --no-private" do
       Registry.clear
       YARD.parse_string <<-eof
         # @private
@@ -483,321 +478,321 @@ describe YARD::CLI::Yardoc do
         end
       eof
       @yardoc.parse_arguments *%w( --no-private )
-      @yardoc.options.verifier.call(Registry.at('ABC')).should be_false
-      @yardoc.options.verifier.call(Registry.at('ABC#foo')).should be_false
+      expect(@yardoc.options.verifier.call(Registry.at('ABC'))).to be false
+      expect(@yardoc.options.verifier.call(Registry.at('ABC#foo'))).to be false
     end
   end
 
-  describe '.yardopts and .document handling' do
+  describe ".yardopts and .document handling" do
     before do
       @yardoc.use_yardopts_file = true
     end
 
-    it "should search for and use yardopts file specified by #options_file" do
-      File.should_receive(:read_binary).with("test").and_return("-o \n\nMYPATH\nFILE1 FILE2")
+    it "searches for and uses yardopts file specified by #options_file" do
+      expect(File).to receive(:read_binary).with("test").and_return("-o \n\nMYPATH\nFILE1 FILE2")
       @yardoc.use_document_file = false
       @yardoc.options_file = "test"
       @yardoc.run
-      @yardoc.options.serializer.options[:basepath].should == "MYPATH"
-      @yardoc.files.should == ["FILE1", "FILE2"]
+      expect(@yardoc.options.serializer.options[:basepath]).to eq "MYPATH"
+      expect(@yardoc.files).to eq ["FILE1", "FILE2"]
     end
 
-    it "should use String#shell_split to split .yardopts tokens" do
+    it "uses String#shell_split to split .yardopts tokens" do
       optsdata = "foo bar"
-      optsdata.should_receive(:shell_split)
-      File.should_receive(:read_binary).with("test").and_return(optsdata)
+      expect(optsdata).to receive(:shell_split)
+      expect(File).to receive(:read_binary).with("test").and_return(optsdata)
       @yardoc.options_file = "test"
       @yardoc.run
     end
 
-    it "should allow opts specified in command line to override yardopts file" do
-      File.should_receive(:read_binary).with(".yardopts").and_return("-o NOTMYPATH")
+    it "allows opts specified in command line to override yardopts file" do
+      expect(File).to receive(:read_binary).with(".yardopts").and_return("-o NOTMYPATH")
       @yardoc.run("-o", "MYPATH", "FILE")
-      @yardoc.options.serializer.options[:basepath].should == "MYPATH"
-      @yardoc.files.should == ["FILE"]
+      expect(@yardoc.options.serializer.options[:basepath]).to eq "MYPATH"
+      expect(@yardoc.files).to eq ["FILE"]
     end
 
-    it "should load the RDoc .document file if found" do
-      File.should_receive(:read_binary).with(".yardopts").and_return("-o NOTMYPATH")
+    it "loads the RDoc .document file if found" do
+      expect(File).to receive(:read_binary).with(".yardopts").and_return("-o NOTMYPATH")
       @yardoc.use_document_file = true
-      @yardoc.stub!(:support_rdoc_document_file!).and_return(["FILE2", "FILE3"])
+      allow(@yardoc).to receive(:support_rdoc_document_file!).and_return(["FILE2", "FILE3"])
       @yardoc.run("-o", "MYPATH", "FILE1")
-      @yardoc.options.serializer.options[:basepath].should == "MYPATH"
-      @yardoc.files.should == ["FILE2", "FILE3", "FILE1"]
+      expect(@yardoc.options.serializer.options[:basepath]).to eq "MYPATH"
+      expect(@yardoc.files).to eq ["FILE2", "FILE3", "FILE1"]
     end
   end
 
-  describe 'Query options' do
+  describe "Query options" do
     after { Registry.clear }
 
-    it "should hide private constants in with default visibilities" do
+    it "hides private constants in with default visibilities" do
       classobj = CodeObjects::ClassObject.new(:root, :Foo) {|o| o.visibility = :private }
       @yardoc.run
-      @yardoc.options.verifier.run([classobj]).should == []
+      expect(@yardoc.options.verifier.run([classobj])).to eq []
     end
 
-    it "should setup visibility rules as verifier" do
+    it "sets up visibility rules as verifier" do
       methobj = CodeObjects::MethodObject.new(:root, :test) {|o| o.visibility = :private }
-      File.should_receive(:read_binary).with("test").and_return("--private")
+      expect(File).to receive(:read_binary).with("test").and_return("--private")
       @yardoc.use_yardopts_file = true
       @yardoc.options_file = "test"
       @yardoc.run
-      @yardoc.options.verifier.call(methobj).should be_true
+      expect(@yardoc.options.verifier.call(methobj)).to be true
     end
 
-    it "should accept a --query" do
+    it "accepts a --query" do
       @yardoc.parse_arguments *%w( --query @return )
-      @yardoc.options.verifier.should be_a(Verifier)
+      expect(@yardoc.options.verifier).to be_a(Verifier)
     end
 
-    it "should accept multiple --query arguments" do
-      obj = mock(:object)
-      obj.should_receive(:tag).ordered.with('return').and_return(true)
-      obj.should_receive(:tag).ordered.with('tag').and_return(false)
+    it "accepts multiple --query arguments" do
+      obj = double(:object)
+      expect(obj).to receive(:tag).ordered.with('return').and_return(true)
+      expect(obj).to receive(:tag).ordered.with('tag').and_return(false)
       @yardoc.parse_arguments *%w( --query @return --query @tag )
-      @yardoc.options.verifier.should be_a(Verifier)
-      @yardoc.options.verifier.call(obj).should == false
+      expect(@yardoc.options.verifier).to be_a(Verifier)
+      expect(@yardoc.options.verifier.call(obj)).to be false
     end
   end
 
-  describe 'Extra file arguments' do
-    it "should accept extra files if specified after '-' with source files" do
-      Dir.should_receive(:glob).with('README{,*[^~]}').and_return([])
-      File.should_receive(:file?).with('extra_file1').and_return(true)
-      File.should_receive(:file?).with('extra_file2').and_return(true)
-      File.should_receive(:read).with('extra_file1').and_return('')
-      File.should_receive(:read).with('extra_file2').and_return('')
+  describe "Extra file arguments" do
+    it "accepts extra files if specified after '-' with source files" do
+      expect(Dir).to receive(:glob).with('README{,*[^~]}').and_return([])
+      expect(File).to receive(:file?).with('extra_file1').and_return(true)
+      expect(File).to receive(:file?).with('extra_file2').and_return(true)
+      expect(File).to receive(:read).with('extra_file1').and_return('')
+      expect(File).to receive(:read).with('extra_file2').and_return('')
       @yardoc.parse_arguments *%w( file1 file2 - extra_file1 extra_file2 )
-      @yardoc.files.should == %w( file1 file2 )
-      @yardoc.options.files.should ==
+      expect(@yardoc.files).to eq %w( file1 file2 )
+      expect(@yardoc.options.files).to eq(
         [CodeObjects::ExtraFileObject.new('extra_file1', ''),
-          CodeObjects::ExtraFileObject.new('extra_file2', '')]
+          CodeObjects::ExtraFileObject.new('extra_file2', '')])
     end
 
-    it "should accept files section only containing extra files" do
-      Dir.should_receive(:glob).with('README{,*[^~]}').and_return([])
+    it "accepts files section only containing extra files" do
+      expect(Dir).to receive(:glob).with('README{,*[^~]}').and_return([])
       @yardoc.parse_arguments *%w( - LICENSE )
-      @yardoc.files.should == %w( {lib,app}/**/*.rb ext/**/*.c )
-      @yardoc.options.files.should == [CodeObjects::ExtraFileObject.new('LICENSE', '')]
+      expect(@yardoc.files).to eq Parser::SourceParser::DEFAULT_PATH_GLOB
+      expect(@yardoc.options.files).to eq [CodeObjects::ExtraFileObject.new('LICENSE', '')]
     end
 
-    it "should accept globs as extra files" do
-      Dir.should_receive(:glob).with('README{,*[^~]}').and_return []
-      Dir.should_receive(:glob).with('*.txt').and_return ['a.txt', 'b.txt']
-      File.should_receive(:read).with('a.txt').and_return('')
-      File.should_receive(:read).with('b.txt').and_return('')
-      File.should_receive(:file?).with('a.txt').and_return(true)
-      File.should_receive(:file?).with('b.txt').and_return(true)
+    it "accepts globs as extra files" do
+      expect(Dir).to receive(:glob).with('README{,*[^~]}').and_return []
+      expect(Dir).to receive(:glob).with('*.txt').and_return ['a.txt', 'b.txt']
+      expect(File).to receive(:read).with('a.txt').and_return('')
+      expect(File).to receive(:read).with('b.txt').and_return('')
+      expect(File).to receive(:file?).with('a.txt').and_return(true)
+      expect(File).to receive(:file?).with('b.txt').and_return(true)
       @yardoc.parse_arguments *%w( file1 file2 - *.txt )
-      @yardoc.files.should == %w( file1 file2 )
-      @yardoc.options.files.should ==
+      expect(@yardoc.files).to eq %w( file1 file2 )
+      expect(@yardoc.options.files).to eq(
         [CodeObjects::ExtraFileObject.new('a.txt', ''),
-          CodeObjects::ExtraFileObject.new('b.txt', '')]
+          CodeObjects::ExtraFileObject.new('b.txt', '')])
     end
 
-    it "should warn if extra file is not found" do
-      log.should_receive(:warn).with(/Could not find extra file: UNKNOWN/)
+    it "warns if extra file is not found" do
+      expect(log).to receive(:warn).with(/Could not find extra file: UNKNOWN/)
       @yardoc.parse_arguments *%w( - UNKNOWN )
     end
 
-    it "should warn if readme file is not found" do
-      log.should_receive(:warn).with(/Could not find readme file: UNKNOWN/)
+    it "warns if readme file is not found" do
+      expect(log).to receive(:warn).with(/Could not find readme file: UNKNOWN/)
       @yardoc.parse_arguments *%w( -r UNKNOWN )
     end
 
-    it "should use first file as readme if no readme is specified when using --one-file" do
-      Dir.should_receive(:glob).with('README{,*[^~]}').and_return []
-      Dir.should_receive(:glob).with('lib/*.rb').and_return(['lib/foo.rb'])
-      File.should_receive(:read).with('lib/foo.rb').and_return('')
+    it "uses first file as readme if no readme is specified when using --one-file" do
+      expect(Dir).to receive(:glob).with('README{,*[^~]}').and_return []
+      expect(Dir).to receive(:glob).with('lib/*.rb').and_return(['lib/foo.rb'])
+      expect(File).to receive(:read).with('lib/foo.rb').and_return('')
       @yardoc.parse_arguments *%w( --one-file lib/*.rb )
-      @yardoc.options.readme.should == CodeObjects::ExtraFileObject.new('lib/foo.rb', '')
+      expect(@yardoc.options.readme).to eq CodeObjects::ExtraFileObject.new('lib/foo.rb', '')
     end
 
-    it "should use readme it exists when using --one-file" do
-      Dir.should_receive(:glob).with('README{,*[^~]}').and_return ['README']
-      File.should_receive(:read).with('README').and_return('')
+    it "uses readme it exists when using --one-file" do
+      expect(Dir).to receive(:glob).with('README{,*[^~]}').and_return ['README']
+      expect(File).to receive(:read).with('README').and_return('')
       @yardoc.parse_arguments *%w( --one-file lib/*.rb )
-      @yardoc.options.readme.should == CodeObjects::ExtraFileObject.new('README', '')
+      expect(@yardoc.options.readme).to eq CodeObjects::ExtraFileObject.new('README', '')
     end
 
-    it "should not allow US-ASCII charset when using --one-file" do
+    it "does not allow US-ASCII charset when using --one-file" do
       ienc = Encoding.default_internal
       eenc = Encoding.default_external
-      log.should_receive(:warn).with(/not compatible with US-ASCII.*using ASCII-8BIT/)
+      expect(log).to receive(:warn).with(/not compatible with US-ASCII.*using ASCII-8BIT/)
       @yardoc.parse_arguments *%w( --one-file --charset us-ascii )
-      Encoding.default_internal.name.should == 'ASCII-8BIT'
-      Encoding.default_external.name.should == 'ASCII-8BIT'
+      expect(Encoding.default_internal.name).to eq 'ASCII-8BIT'
+      expect(Encoding.default_external.name).to eq 'ASCII-8BIT'
       Encoding.default_internal = ienc
       Encoding.default_external = eenc
     end if defined?(::Encoding)
   end
 
-  describe 'Source file arguments' do
-    it "should accept no params and parse {lib,app}/**/*.rb ext/**/*.c" do
+  describe "Source file arguments" do
+    it "accepts no params and parse {lib,app}/**/*.rb ext/**/*.c" do
       @yardoc.parse_arguments
-      @yardoc.files.should == %w( {lib,app}/**/*.rb ext/**/*.c )
+      expect(@yardoc.files).to eq Parser::SourceParser::DEFAULT_PATH_GLOB
     end
   end
 
-  describe 'Tags options' do
+  describe "Tags options" do
     def tag_created(switch, factory_method)
-      visible_tags = mock(:visible_tags)
-      visible_tags.should_receive(:|).ordered.with([:foo])
-      visible_tags.should_receive(:-).ordered.with([]).and_return(visible_tags)
-      Tags::Library.should_receive(:define_tag).with('Foo', :foo, factory_method)
-      Tags::Library.stub!(:visible_tags=)
-      Tags::Library.should_receive(:visible_tags).at_least(1).times.and_return(visible_tags)
+      visible_tags = double(:visible_tags)
+      expect(visible_tags).to receive(:|).ordered.with([:foo])
+      expect(visible_tags).to receive(:-).ordered.with([]).and_return(visible_tags)
+      expect(Tags::Library).to receive(:define_tag).with('Foo', :foo, factory_method)
+      allow(Tags::Library).to receive(:visible_tags=)
+      expect(Tags::Library).to receive(:visible_tags).at_least(1).times.and_return(visible_tags)
       @yardoc.parse_arguments("--#{switch}-tag", 'foo')
     end
 
     def tag_hidden(tag)
-      visible_tags = mock(:visible_tags)
-      visible_tags.should_receive(:|).ordered.with([tag])
-      visible_tags.should_receive(:-).ordered.with([tag]).and_return([])
-      Tags::Library.should_receive(:define_tag).with(tag.to_s.capitalize, tag, nil)
-      Tags::Library.stub!(:visible_tags=)
-      Tags::Library.should_receive(:visible_tags).at_least(1).times.and_return(visible_tags)
+      visible_tags = double(:visible_tags)
+      expect(visible_tags).to receive(:|).ordered.with([tag])
+      expect(visible_tags).to receive(:-).ordered.with([tag]).and_return([])
+      expect(Tags::Library).to receive(:define_tag).with(tag.to_s.capitalize, tag, nil)
+      allow(Tags::Library).to receive(:visible_tags=)
+      expect(Tags::Library).to receive(:visible_tags).at_least(1).times.and_return(visible_tags)
     end
 
-    it "should accept --tag" do
-      Tags::Library.should_receive(:define_tag).with('Title of Foo', :foo, nil)
+    it "accepts --tag" do
+      expect(Tags::Library).to receive(:define_tag).with('Title of Foo', :foo, nil)
       @yardoc.parse_arguments('--tag', 'foo:Title of Foo')
     end
 
-    it "should accept --tag without title (and default to captialized tag name)" do
-      Tags::Library.should_receive(:define_tag).with('Foo', :foo, nil)
+    it "accepts --tag without title (and default to captialized tag name)" do
+      expect(Tags::Library).to receive(:define_tag).with('Foo', :foo, nil)
       @yardoc.parse_arguments('--tag', 'foo')
     end
 
-    it "should only list tag once if declared twice" do
+    it "only lists tag once if declared twice" do
       visible_tags = []
-      Tags::Library.stub!(:define_tag)
-      Tags::Library.stub!(:visible_tags).and_return([:foo])
-      Tags::Library.stub!(:visible_tags=) {|value| visible_tags = value }
+      allow(Tags::Library).to receive(:define_tag)
+      allow(Tags::Library).to receive(:visible_tags).and_return([:foo])
+      allow(Tags::Library).to receive(:visible_tags=) {|value| visible_tags = value }
       @yardoc.parse_arguments('--tag', 'foo', '--tag', 'foo')
-      visible_tags.should == [:foo]
+      expect(visible_tags).to eq [:foo]
     end
 
-    it "should accept --type-tag" do
+    it "accepts --type-tag" do
       tag_created 'type', :with_types
     end
 
-    it "should accept --type-name-tag" do
+    it "accepts --type-name-tag" do
       tag_created 'type-name', :with_types_and_name
     end
 
-    it "should accept --name-tag" do
+    it "accepts --name-tag" do
       tag_created 'name', :with_name
     end
 
-    it "should accept --title-tag" do
+    it "accepts --title-tag" do
       tag_created 'title', :with_title_and_text
     end
 
-    it "should accept --hide-tag before tag is listed" do
+    it "accepts --hide-tag before tag is listed" do
       tag_hidden(:anewfoo)
       @yardoc.parse_arguments('--hide-tag', 'anewfoo', '--tag', 'anewfoo')
     end
 
-    it "should accept --hide-tag after tag is listed" do
+    it "accepts --hide-tag after tag is listed" do
       tag_hidden(:anewfoo2)
       @yardoc.parse_arguments('--tag', 'anewfoo2', '--hide-tag', 'anewfoo2')
     end
 
-    it "should accept --transitive-tag" do
+    it "accepts --transitive-tag" do
       @yardoc.parse_arguments('--transitive-tag', 'foo')
-      Tags::Library.transitive_tags.should include(:foo)
+      expect(Tags::Library.transitive_tags).to include(:foo)
     end
 
-    it "should accept --non-transitive-tag" do
+    it "accepts --non-transitive-tag" do
       Tags::Library.transitive_tags |= [:foo]
       @yardoc.parse_arguments('--non-transitive-tag', 'foo')
-      Tags::Library.transitive_tags.should_not include(:foo)
+      expect(Tags::Library.transitive_tags).not_to include(:foo)
     end
   end
 
-  describe 'Safe mode' do
+  describe "Safe mode" do
     before do
-      YARD::Config.stub!(:options).and_return(:safe_mode => true)
+      allow(YARD::Config).to receive(:options).and_return(:safe_mode => true)
     end
 
-    it "should not allow --load or -e in safe mode" do
-      @yardoc.should_not_receive(:require)
+    it "does not allow --load or -e in safe mode" do
+      expect(@yardoc).not_to receive(:require)
       @yardoc.run('--load', 'foo')
       @yardoc.run('-e', 'foo')
     end
 
-    it "should not allow --query in safe mode" do
+    it "does not allow --query in safe mode" do
       @yardoc.run('--query', 'foo')
-      @yardoc.options.verifier.expressions.should_not include("foo")
+      expect(@yardoc.options.verifier.expressions).not_to include("foo")
     end
 
-    it "should not allow modifying the template paths" do
-      YARD::Templates::Engine.should_not_receive(:register_template_path)
+    it "does not allow modifying the template paths" do
+      expect(YARD::Templates::Engine).not_to receive(:register_template_path)
       @yardoc.run('-p', 'foo')
       @yardoc.run('--template-path', 'foo')
     end
   end
 
-  describe 'Markup Loading' do
-    it "should load rdoc markup if no markup is provided" do
+  describe "Markup Loading" do
+    it "loads rdoc markup if no markup is provided" do
       @yardoc.generate = true
       @yardoc.run
-      @yardoc.options.markup.should == :rdoc
+      expect(@yardoc.options.markup).to eq :rdoc
     end
 
-    it "should load rdoc markup even when no output is specified" do
+    it "loads rdoc markup even when no output is specified" do
       @yardoc.parse_arguments('--no-output')
-      @yardoc.options.markup.should == :rdoc
+      expect(@yardoc.options.markup).to eq :rdoc
     end
 
-    it "should warn if rdoc cannot be loaded and fallback to :none" do
+    it "warns if rdoc cannot be loaded and fallback to :none" do
       mod = YARD::Templates::Helpers::MarkupHelper
       mod.clear_markup_cache
-      mod.const_get(:MARKUP_PROVIDERS).should_receive(:[]).with(:rdoc).and_return([{:lib => 'INVALID'}])
-      log.should_receive(:warn).with(/Could not load default RDoc formatter/)
-      @yardoc.stub(:generate) { @yardoc.options.files = []; true }
+      expect(mod.const_get(:MARKUP_PROVIDERS)).to receive(:[]).with(:rdoc).and_return([{:lib => 'INVALID'}])
+      expect(log).to receive(:warn).with(/Could not load default RDoc formatter/)
+      allow(@yardoc).to receive(:generate) { @yardoc.options.files = []; true }
       @yardoc.run
-      @yardoc.options.markup.should == :none
+      expect(@yardoc.options.markup).to eq :none
       mod.clear_markup_cache
     end
 
-    it "should error immediately if markup for any files are missing" do
+    it "returns an error immediately if markup for any files are missing" do
       mod = YARD::Templates::Helpers::MarkupHelper
       mod.clear_markup_cache
-      mod.const_get(:MARKUP_PROVIDERS).should_receive(:[]).with(:markdown).and_return([{:lib => 'INVALID'}])
-      log.should_receive(:error).with(/Missing 'INVALID' gem for Markdown formatting/)
+      expect(mod.const_get(:MARKUP_PROVIDERS)).to receive(:[]).with(:markdown).and_return([{:lib => 'INVALID'}])
+      expect(log).to receive(:error).with(/Missing 'INVALID' gem for Markdown formatting/)
       files = [CodeObjects::ExtraFileObject.new('test.md', '')]
-      @yardoc.stub(:generate) { @yardoc.options.files = files; true }
+      allow(@yardoc).to receive(:generate) { @yardoc.options.files = files; true }
       @yardoc.run
       mod.clear_markup_cache
     end
 
-    it "should error immediately if markup for any files are missing (file markup specified in attributes)" do
+    it "returns an error immediately if markup for any files are missing (file markup specified in attributes)" do
       mod = YARD::Templates::Helpers::MarkupHelper
       mod.clear_markup_cache
-      mod.const_get(:MARKUP_PROVIDERS).should_receive(:[]).with(:markdown).and_return([{:lib => 'INVALID'}])
-      log.should_receive(:error).with(/Missing 'INVALID' gem for Markdown formatting/)
+      expect(mod.const_get(:MARKUP_PROVIDERS)).to receive(:[]).with(:markdown).and_return([{:lib => 'INVALID'}])
+      expect(log).to receive(:error).with(/Missing 'INVALID' gem for Markdown formatting/)
       files = [CodeObjects::ExtraFileObject.new('test', '# @markup markdown')]
-      @yardoc.stub(:generate) { @yardoc.options.files = files; true }
+      allow(@yardoc).to receive(:generate) { @yardoc.options.files = files; true }
       @yardoc.run
       mod.clear_markup_cache
     end
   end
 
-  describe '#run' do
-    it "should parse_arguments if run() is called" do
-      @yardoc.should_receive(:parse_arguments)
+  describe "#run" do
+    it "parses arguments if run() is called" do
+      expect(@yardoc).to receive(:parse_arguments)
       @yardoc.run
     end
 
-    it "should parse_arguments if run(arg1, arg2, ...) is called" do
-      @yardoc.should_receive(:parse_arguments)
+    it "parses arguments if run(arg1, arg2, ...) is called" do
+      expect(@yardoc).to receive(:parse_arguments)
       @yardoc.run('--private', '-p', 'foo')
     end
 
-    it "should not parse_arguments if run(nil) is called" do
-      @yardoc.should_not_receive(:parse_arguments)
+    it "does not parse arguments if run(nil) is called" do
+      expect(@yardoc).not_to receive(:parse_arguments)
       @yardoc.run(nil)
     end
   end