Commit a0cb1b47 by cuong.tran

Convert specs to RSpec 3.0.1 syntax with Transpec

This conversion is done by Transpec 2.2.5 with the following command: transpec * 34 conversions from: obj.should to: expect(obj).to * 27 conversions from: obj.should_receive(:message) to: expect(obj).to receive(:message) * 18 conversions from: == expected to: eq(expected) * 4 conversions from: obj.should_not to: expect(obj).not_to * 4 conversions from: obj.stub(:message) to: allow(obj).to receive(:message) For more details: https://github.com/yujinakayama/transpec#supported-conversions
parent 70e82adb
...@@ -30,12 +30,12 @@ describe AnnotateModels do ...@@ -30,12 +30,12 @@ describe AnnotateModels do
double("Column", stubs) double("Column", stubs)
end end
it { AnnotateModels.quote(nil).should eql("NULL") } it { expect(AnnotateModels.quote(nil)).to eql("NULL") }
it { AnnotateModels.quote(true).should eql("TRUE") } it { expect(AnnotateModels.quote(true)).to eql("TRUE") }
it { AnnotateModels.quote(false).should eql("FALSE") } it { expect(AnnotateModels.quote(false)).to eql("FALSE") }
it { AnnotateModels.quote(25).should eql("25") } it { expect(AnnotateModels.quote(25)).to eql("25") }
it { AnnotateModels.quote(25.6).should eql("25.6") } it { expect(AnnotateModels.quote(25.6)).to eql("25.6") }
it { AnnotateModels.quote(1e-20).should eql("1.0e-20") } it { expect(AnnotateModels.quote(1e-20)).to eql("1.0e-20") }
it "should get schema info" do it "should get schema info" do
klass = mock_class(:users, :id, [ klass = mock_class(:users, :id, [
...@@ -43,7 +43,7 @@ describe AnnotateModels do ...@@ -43,7 +43,7 @@ describe AnnotateModels do
mock_column(:name, :string, :limit => 50) mock_column(:name, :string, :limit => 50)
]) ])
AnnotateModels.get_schema_info(klass, "Schema Info").should eql(<<-EOS) expect(AnnotateModels.get_schema_info(klass, "Schema Info")).to eql(<<-EOS)
# Schema Info # Schema Info
# #
# Table name: users # Table name: users
...@@ -60,7 +60,7 @@ EOS ...@@ -60,7 +60,7 @@ EOS
mock_column(:name, :string, :limit => 50) mock_column(:name, :string, :limit => 50)
]) ])
AnnotateModels.get_schema_info(klass, "Schema Info").should eql(<<-EOS) expect(AnnotateModels.get_schema_info(klass, "Schema Info")).to eql(<<-EOS)
# Schema Info # Schema Info
# #
# Table name: users # Table name: users
...@@ -78,7 +78,7 @@ EOS ...@@ -78,7 +78,7 @@ EOS
mock_column(:name, :string, :limit => 50) mock_column(:name, :string, :limit => 50)
]) ])
AnnotateModels.get_schema_info(klass, "Schema Info").should eql(<<-EOS) expect(AnnotateModels.get_schema_info(klass, "Schema Info")).to eql(<<-EOS)
# Schema Info # Schema Info
# #
# Table name: users # Table name: users
...@@ -95,7 +95,7 @@ EOS ...@@ -95,7 +95,7 @@ EOS
mock_column(:name, :enum, :limit => [:enum1, :enum2]) mock_column(:name, :enum, :limit => [:enum1, :enum2])
]) ])
AnnotateModels.get_schema_info(klass, "Schema Info").should eql(<<-EOS) expect(AnnotateModels.get_schema_info(klass, "Schema Info")).to eql(<<-EOS)
# Schema Info # Schema Info
# #
# Table name: users # Table name: users
...@@ -111,7 +111,7 @@ EOS ...@@ -111,7 +111,7 @@ EOS
mock_column(:id, :integer), mock_column(:id, :integer),
mock_column(:name, :string, :limit => 50) mock_column(:name, :string, :limit => 50)
]) ])
AnnotateModels.get_schema_info(klass, AnnotateModels::PREFIX, :format_rdoc => true).should eql(<<-EOS) expect(AnnotateModels.get_schema_info(klass, AnnotateModels::PREFIX, :format_rdoc => true)).to eql(<<-EOS)
# #{AnnotateModels::PREFIX} # #{AnnotateModels::PREFIX}
# #
# Table name: users # Table name: users
...@@ -148,8 +148,8 @@ EOS ...@@ -148,8 +148,8 @@ EOS
def check_class_name(file, class_name) def check_class_name(file, class_name)
klass = AnnotateModels.get_model_class(file) klass = AnnotateModels.get_model_class(file)
klass.should_not == nil expect(klass).not_to eq(nil)
klass.name.should == class_name expect(klass.name).to eq(class_name)
end end
before :each do before :each do
...@@ -283,9 +283,9 @@ EOS ...@@ -283,9 +283,9 @@ EOS
has_many :yah has_many :yah
end end
EOS EOS
capturing(:stderr) do expect(capturing(:stderr) do
check_class_name 'foo_with_known_macro.rb', 'FooWithKnownMacro' check_class_name 'foo_with_known_macro.rb', 'FooWithKnownMacro'
end.should == "" end).to eq("")
end end
it "should not require model files twice" do it "should not require model files twice" do
...@@ -298,9 +298,9 @@ EOS ...@@ -298,9 +298,9 @@ EOS
Kernel.load "#{path}.rb" Kernel.load "#{path}.rb"
expect(Kernel).not_to receive(:require).with(path) expect(Kernel).not_to receive(:require).with(path)
capturing(:stderr) { expect(capturing(:stderr) {
check_class_name 'loaded_class.rb', 'LoadedClass' check_class_name 'loaded_class.rb', 'LoadedClass'
}.should_not include("warning: already initialized constant LoadedClass::CONSTANT") }).not_to include("warning: already initialized constant LoadedClass::CONSTANT")
end end
end end
...@@ -340,7 +340,7 @@ end ...@@ -340,7 +340,7 @@ end
AnnotateModels.remove_annotation_of_file(path) AnnotateModels.remove_annotation_of_file(path)
content(path).should == <<-EOS expect(content(path)).to eq <<-EOS
class Foo < ActiveRecord::Base class Foo < ActiveRecord::Base
end end
EOS EOS
...@@ -364,7 +364,7 @@ end ...@@ -364,7 +364,7 @@ end
AnnotateModels.remove_annotation_of_file(path) AnnotateModels.remove_annotation_of_file(path)
content(path).should == <<-EOS expect(content(path)).to eq <<-EOS
class Foo < ActiveRecord::Base class Foo < ActiveRecord::Base
end end
EOS EOS
...@@ -417,17 +417,17 @@ end ...@@ -417,17 +417,17 @@ end
it "should put annotation before class if :position == 'before'" do it "should put annotation before class if :position == 'before'" do
annotate_one_file :position => "before" annotate_one_file :position => "before"
File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}" expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
end end
it "should put annotation before class if :position => :before" do it "should put annotation before class if :position => :before" do
annotate_one_file :position => :before annotate_one_file :position => :before
File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}" expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
end end
it "should put annotation after class if :position => :after" do it "should put annotation after class if :position => :after" do
annotate_one_file :position => :after annotate_one_file :position => :after
File.read(@model_file_name).should == "#{@file_content}\n#{@schema_info}" expect(File.read(@model_file_name)).to eq("#{@file_content}\n#{@schema_info}")
end end
describe "with existing annotation => :before" do describe "with existing annotation => :before" do
...@@ -440,17 +440,17 @@ end ...@@ -440,17 +440,17 @@ end
it "should retain current position" do it "should retain current position" do
annotate_one_file annotate_one_file
File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}" expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
end end
it "should retain current position even when :position is changed to :after" do it "should retain current position even when :position is changed to :after" do
annotate_one_file :position => :after annotate_one_file :position => :after
File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}" expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
end end
it "should change position to :after when :force => true" do it "should change position to :after when :force => true" do
annotate_one_file :position => :after, :force => true annotate_one_file :position => :after, :force => true
File.read(@model_file_name).should == "#{@file_content}\n#{@schema_info}" expect(File.read(@model_file_name)).to eq("#{@file_content}\n#{@schema_info}")
end end
end end
...@@ -464,17 +464,17 @@ end ...@@ -464,17 +464,17 @@ end
it "should retain current position" do it "should retain current position" do
annotate_one_file annotate_one_file
File.read(@model_file_name).should == "#{@file_content}\n#{@schema_info}" expect(File.read(@model_file_name)).to eq("#{@file_content}\n#{@schema_info}")
end end
it "should retain current position even when :position is changed to :before" do it "should retain current position even when :position is changed to :before" do
annotate_one_file :position => :before annotate_one_file :position => :before
File.read(@model_file_name).should == "#{@file_content}\n#{@schema_info}" expect(File.read(@model_file_name)).to eq("#{@file_content}\n#{@schema_info}")
end end
it "should change position to :before when :force => true" do it "should change position to :before when :force => true" do
annotate_one_file :position => :before, :force => true annotate_one_file :position => :before, :force => true
File.read(@model_file_name).should == "#{@schema_info}\n#{@file_content}" expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
end end
end end
...@@ -496,7 +496,7 @@ end ...@@ -496,7 +496,7 @@ end
]) ])
schema_info = AnnotateModels.get_schema_info(klass, "== Schema Info") schema_info = AnnotateModels.get_schema_info(klass, "== Schema Info")
AnnotateModels.annotate_one_file(model_file_name, schema_info, :position => :before) AnnotateModels.annotate_one_file(model_file_name, schema_info, :position => :before)
File.read(model_file_name).should == "#{schema_info}\n#{file_content}" expect(File.read(model_file_name)).to eq("#{schema_info}\n#{file_content}")
end end
it "should not touch encoding comments" do it "should not touch encoding comments" do
...@@ -509,13 +509,13 @@ end ...@@ -509,13 +509,13 @@ end
annotate_one_file :position => :before annotate_one_file :position => :before
File.open(@model_file_name, &:readline).should == "#{encoding_comment}\n" expect(File.open(@model_file_name, &:readline)).to eq("#{encoding_comment}\n")
end end
end end
describe "if a file can't be annotated" do describe "if a file can't be annotated" do
before do before do
AnnotateModels.stub(:get_loaded_model).with('user').and_return(nil) allow(AnnotateModels).to receive(:get_loaded_model).with('user').and_return(nil)
write_model('user.rb', <<-EOS) write_model('user.rb', <<-EOS)
class User < ActiveRecord::Base class User < ActiveRecord::Base
...@@ -525,27 +525,27 @@ end ...@@ -525,27 +525,27 @@ end
end end
it "displays an error message" do it "displays an error message" do
capturing(:stdout) { expect(capturing(:stdout) {
AnnotateModels.do_annotations :model_dir => @model_dir, :is_rake => true AnnotateModels.do_annotations :model_dir => @model_dir, :is_rake => true
}.should include("Unable to annotate user.rb: oops") }).to include("Unable to annotate user.rb: oops")
end end
it "displays the full stack trace with --trace" do it "displays the full stack trace with --trace" do
capturing(:stdout) { expect(capturing(:stdout) {
AnnotateModels.do_annotations :model_dir => @model_dir, :trace => true, :is_rake => true AnnotateModels.do_annotations :model_dir => @model_dir, :trace => true, :is_rake => true
}.should include("/spec/annotate/annotate_models_spec.rb:") }).to include("/spec/annotate/annotate_models_spec.rb:")
end end
it "omits the full stack trace without --trace" do it "omits the full stack trace without --trace" do
capturing(:stdout) { expect(capturing(:stdout) {
AnnotateModels.do_annotations :model_dir => @model_dir, :trace => false, :is_rake => true AnnotateModels.do_annotations :model_dir => @model_dir, :trace => false, :is_rake => true
}.should_not include("/spec/annotate/annotate_models_spec.rb:") }).not_to include("/spec/annotate/annotate_models_spec.rb:")
end end
end end
describe "if a file can't be deannotated" do describe "if a file can't be deannotated" do
before do before do
AnnotateModels.stub(:get_loaded_model).with('user').and_return(nil) allow(AnnotateModels).to receive(:get_loaded_model).with('user').and_return(nil)
write_model('user.rb', <<-EOS) write_model('user.rb', <<-EOS)
class User < ActiveRecord::Base class User < ActiveRecord::Base
...@@ -555,21 +555,21 @@ end ...@@ -555,21 +555,21 @@ end
end end
it "displays an error message" do it "displays an error message" do
capturing(:stdout) { expect(capturing(:stdout) {
AnnotateModels.remove_annotations :model_dir => @model_dir, :is_rake => true AnnotateModels.remove_annotations :model_dir => @model_dir, :is_rake => true
}.should include("Unable to deannotate user.rb: oops") }).to include("Unable to deannotate user.rb: oops")
end end
it "displays the full stack trace" do it "displays the full stack trace" do
capturing(:stdout) { expect(capturing(:stdout) {
AnnotateModels.remove_annotations :model_dir => @model_dir, :trace => true, :is_rake => true AnnotateModels.remove_annotations :model_dir => @model_dir, :trace => true, :is_rake => true
}.should include("/user.rb:2:in `<class:User>'") }).to include("/user.rb:2:in `<class:User>'")
end end
it "omits the full stack trace without --trace" do it "omits the full stack trace without --trace" do
capturing(:stdout) { expect(capturing(:stdout) {
AnnotateModels.remove_annotations :model_dir => @model_dir, :trace => false, :is_rake => true AnnotateModels.remove_annotations :model_dir => @model_dir, :trace => false, :is_rake => true
}.should_not include("/user.rb:2:in `<class:User>'") }).not_to include("/user.rb:2:in `<class:User>'")
end end
end end
end end
...@@ -577,8 +577,8 @@ end ...@@ -577,8 +577,8 @@ end
describe '.annotate_model_file' do describe '.annotate_model_file' do
before do before do
class Foo < ActiveRecord::Base; end; class Foo < ActiveRecord::Base; end;
AnnotateModels.stub(:get_model_class).with('foo.rb') { Foo } allow(AnnotateModels).to receive(:get_model_class).with('foo.rb') { Foo }
Foo.stub(:table_exists?) { false } allow(Foo).to receive(:table_exists?) { false }
end end
after { Object.send :remove_const, 'Foo' } after { Object.send :remove_const, 'Foo' }
...@@ -586,7 +586,7 @@ end ...@@ -586,7 +586,7 @@ end
it 'skips attempt to annotate if no table exists for model' do it 'skips attempt to annotate if no table exists for model' do
annotate_model_file = AnnotateModels.annotate_model_file([], 'foo.rb', nil, nil) annotate_model_file = AnnotateModels.annotate_model_file([], 'foo.rb', nil, nil)
annotate_model_file.should eq nil expect(annotate_model_file).to eq nil
end end
end end
end end
...@@ -8,29 +8,29 @@ describe AnnotateRoutes do ...@@ -8,29 +8,29 @@ describe AnnotateRoutes do
end end
it "should check if routes.rb exists" do it "should check if routes.rb exists" do
File.should_receive(:exists?).with("config/routes.rb").and_return(false) expect(File).to receive(:exists?).with("config/routes.rb").and_return(false)
AnnotateRoutes.should_receive(:puts).with("Can`t find routes.rb") expect(AnnotateRoutes).to receive(:puts).with("Can`t find routes.rb")
AnnotateRoutes.do_annotations AnnotateRoutes.do_annotations
end end
describe "When Annotating, with older Rake Versions" do describe "When Annotating, with older Rake Versions" do
before(:each) do before(:each) do
File.should_receive(:exists?).with("config/routes.rb").and_return(true) expect(File).to receive(:exists?).with("config/routes.rb").and_return(true)
AnnotateRoutes.should_receive(:`).with("rake routes").and_return("(in /bad/line)\ngood line") expect(AnnotateRoutes).to receive(:`).with("rake routes").and_return("(in /bad/line)\ngood line")
File.should_receive(:open).with("config/routes.rb", "wb").and_yield(mock_file) expect(File).to receive(:open).with("config/routes.rb", "wb").and_yield(mock_file)
AnnotateRoutes.should_receive(:puts).with("Route file annotated.") expect(AnnotateRoutes).to receive(:puts).with("Route file annotated.")
end end
it "should annotate and add a newline!" do it "should annotate and add a newline!" do
File.should_receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo") expect(File).to receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo")
@mock_file.should_receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# good line\n/) expect(@mock_file).to receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# good line\n/)
AnnotateRoutes.do_annotations AnnotateRoutes.do_annotations
end end
it "should not add a newline if there are empty lines" do it "should not add a newline if there are empty lines" do
File.should_receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo\n") expect(File).to receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo\n")
@mock_file.should_receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# good line\n/) expect(@mock_file).to receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# good line\n/)
AnnotateRoutes.do_annotations AnnotateRoutes.do_annotations
end end
...@@ -39,27 +39,27 @@ describe AnnotateRoutes do ...@@ -39,27 +39,27 @@ describe AnnotateRoutes do
describe "When Annotating, with newer Rake Versions" do describe "When Annotating, with newer Rake Versions" do
before(:each) do before(:each) do
File.should_receive(:exists?).with("config/routes.rb").and_return(true) expect(File).to receive(:exists?).with("config/routes.rb").and_return(true)
AnnotateRoutes.should_receive(:`).with("rake routes").and_return("another good line\ngood line") expect(AnnotateRoutes).to receive(:`).with("rake routes").and_return("another good line\ngood line")
File.should_receive(:open).with("config/routes.rb", "wb").and_yield(mock_file) expect(File).to receive(:open).with("config/routes.rb", "wb").and_yield(mock_file)
AnnotateRoutes.should_receive(:puts).with("Route file annotated.") expect(AnnotateRoutes).to receive(:puts).with("Route file annotated.")
end end
it "should annotate and add a newline!" do it "should annotate and add a newline!" do
File.should_receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo") expect(File).to receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo")
@mock_file.should_receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# another good line\n# good line\n/) expect(@mock_file).to receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# another good line\n# good line\n/)
AnnotateRoutes.do_annotations AnnotateRoutes.do_annotations
end end
it "should not add a newline if there are empty lines" do it "should not add a newline if there are empty lines" do
File.should_receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo\n") expect(File).to receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo\n")
@mock_file.should_receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# another good line\n# good line\n/) expect(@mock_file).to receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map\n#\n# another good line\n# good line\n/)
AnnotateRoutes.do_annotations AnnotateRoutes.do_annotations
end end
it "should add a timestamp when :timestamp is passed" do it "should add a timestamp when :timestamp is passed" do
File.should_receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo") expect(File).to receive(:read).with("config/routes.rb").and_return("ActionController::Routing...\nfoo")
@mock_file.should_receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map \(Updated \d{4}-\d{2}-\d{2} \d{2}:\d{2}\)\n#\n# another good line\n# good line\n/) expect(@mock_file).to receive(:puts).with(/ActionController::Routing...\nfoo\n\n# == Route Map \(Updated \d{4}-\d{2}-\d{2} \d{2}:\d{2}\)\n#\n# another good line\n# good line\n/)
AnnotateRoutes.do_annotations :timestamp => true AnnotateRoutes.do_annotations :timestamp => true
end end
...@@ -68,20 +68,20 @@ describe AnnotateRoutes do ...@@ -68,20 +68,20 @@ describe AnnotateRoutes do
describe "When Removing Annotation" do describe "When Removing Annotation" do
before(:each) do before(:each) do
File.should_receive(:exists?).with("config/routes.rb").and_return(true) expect(File).to receive(:exists?).with("config/routes.rb").and_return(true)
File.should_receive(:open).with("config/routes.rb", "wb").and_yield(mock_file) expect(File).to receive(:open).with("config/routes.rb", "wb").and_yield(mock_file)
AnnotateRoutes.should_receive(:puts).with("Removed annotations from routes file.") expect(AnnotateRoutes).to receive(:puts).with("Removed annotations from routes file.")
end end
it "should remove trailing annotation and trim trailing newlines, but leave leading newlines alone" do it "should remove trailing annotation and trim trailing newlines, but leave leading newlines alone" do
File.should_receive(:read).with("config/routes.rb").and_return("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nActionController::Routing...\nfoo\n\n\n\n\n\n\n\n\n\n\n# == Route Map\n#\n# another good line\n# good line\n") expect(File).to receive(:read).with("config/routes.rb").and_return("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nActionController::Routing...\nfoo\n\n\n\n\n\n\n\n\n\n\n# == Route Map\n#\n# another good line\n# good line\n")
@mock_file.should_receive(:puts).with(/\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nActionController::Routing...\nfoo\n/) expect(@mock_file).to receive(:puts).with(/\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nActionController::Routing...\nfoo\n/)
AnnotateRoutes.remove_annotations AnnotateRoutes.remove_annotations
end end
it "should remove prepended annotation and trim leading newlines, but leave trailing newlines alone" do it "should remove prepended annotation and trim leading newlines, but leave trailing newlines alone" do
File.should_receive(:read).with("config/routes.rb").and_return("# == Route Map\n#\n# another good line\n# good line\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nActionController::Routing...\nfoo\n\n\n\n\n\n\n\n\n\n\n") expect(File).to receive(:read).with("config/routes.rb").and_return("# == Route Map\n#\n# another good line\n# good line\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nActionController::Routing...\nfoo\n\n\n\n\n\n\n\n\n\n\n")
@mock_file.should_receive(:puts).with(/ActionController::Routing...\nfoo\n\n\n\n\n\n\n\n\n\n\n/) expect(@mock_file).to receive(:puts).with(/ActionController::Routing...\nfoo\n\n\n\n\n\n\n\n\n\n\n/)
AnnotateRoutes.remove_annotations AnnotateRoutes.remove_annotations
end end
......
...@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb' ...@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
describe Annotate do describe Annotate do
it "should have a version" do it "should have a version" do
Annotate.version.should be_instance_of(String) expect(Annotate.version).to be_instance_of(String)
end end
end end
...@@ -32,14 +32,14 @@ describe "annotate inside Rails, using #{CURRENT_RUBY}" do ...@@ -32,14 +32,14 @@ describe "annotate inside Rails, using #{CURRENT_RUBY}" do
end end
# Don't proceed if the working copy is dirty! # Don't proceed if the working copy is dirty!
Annotate::Integration.is_clean?(test_rig).should == true expect(Annotate::Integration.is_clean?(test_rig)).to eq(true)
pending "temporarily ignored until Travis can run them" pending "temporarily ignored until Travis can run them"
Bundler.with_clean_env do Bundler.with_clean_env do
dir base_dir do dir base_dir do
temp_dir = Dir.pwd temp_dir = Dir.pwd
File.basename(temp_dir).should == base_dir expect(File.basename(temp_dir)).to eq(base_dir)
# Delete cruft from hands-on debugging... # Delete cruft from hands-on debugging...
Annotate::Integration.nuke_cruft(test_rig) Annotate::Integration.nuke_cruft(test_rig)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment