mspec 1.5.17 → 1.5.18

data/spec/guards/noncompliance_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/noncompliance'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#deviates_on" do
   before :all do

data/spec/guards/platform_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/platform'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#platform_is" do
   before :each do

data/spec/guards/quarantine_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/quarantine'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe QuarantineGuard, "#match?" do
   it "returns false" do

data/spec/guards/runner_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/runner'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe RunnerGuard, "#match?" do
   before :all do

data/spec/guards/specified_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/specified'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#unspecified" do
   before :each do

data/spec/guards/superuser_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/superuser'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#as_superuser" do
   before :each do

data/spec/guards/support_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/support'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#not_supported_on" do
   before :all do

data/spec/guards/tty_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/tty'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#with_tty" do
   before :each do

data/spec/guards/user_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/user'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#as_user" do
   before :each do

data/spec/guards/version_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/version'
+require 'spec_helper'
+require 'mspec/guards'
 
 # The VersionGuard specifies a version of Ruby with a String of
 # the form: v = 'major.minor.tiny.patchlevel'.

data/spec/helpers/argv_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/argv'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#argv" do
   before :each do

data/spec/helpers/const_lookup_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/const_lookup'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 CONST = 2
 

data/spec/helpers/datetime_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
+
+describe Object, "#new_datetime" do
+  it "returns a default DateTime instance" do
+    new_datetime.should == DateTime.new
+  end
+
+  it "returns a DateTime instance with the specified year value" do
+    d = new_datetime :year => 1970
+    d.year.should == 1970
+  end
+
+  it "returns a DateTime instance with the specified month value" do
+    d = new_datetime :month => 11
+    d.mon.should == 11
+  end
+
+  it "returns a DateTime instance with the specified day value" do
+    d = new_datetime :day => 23
+    d.day.should == 23
+  end
+
+  it "returns a DateTime instance with the specified hour value" do
+    d = new_datetime :hour => 10
+    d.hour.should == 10
+  end
+
+  it "returns a DateTime instance with the specified minute value" do
+    d = new_datetime :minute => 10
+    d.min.should == 10
+  end
+
+  it "returns a DateTime instance with the specified second value" do
+    d = new_datetime :second => 2
+    d.sec.should == 2
+  end
+
+  it "returns a DateTime instance with the specified offset value" do
+    d = new_datetime :offset => Rational(3,24)
+    d.offset.should == Rational(3,24)
+  end
+end

data/spec/helpers/ducktype_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/ducktype'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#responds_to" do
   it "returns true for specified symbols" do

data/spec/helpers/encode_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/encode'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#encode" do
   it "raises an ArgumentError if the str parameter is not a String" do

data/spec/helpers/enumerator_class_spec.rb

@@ -1,17 +1,17 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/enumerator_class'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe "#enumerator_class" do
 
-  ruby_version_is ''...'1.8.7' do
+  ruby_version_is ''...'1.9' do
     it "returns Enumerable::Enumerator in Ruby 1.8.6-" do
-      lambda { enumerator_class }.should raise_error(NameError)
       require 'enumerator'
       enumerator_class.should == Enumerable::Enumerator
     end
   end
 
-  ruby_version_is '1.8.7' do
+  ruby_version_is '1.9' do
     it "returns Enumerator in Ruby 1.8.7+" do
       enumerator_class.should == Enumerator
     end

data/spec/helpers/environment_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/platform'
-require 'mspec/helpers/environment'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe "#env" do
   it "returns a hash of variables" do
@@ -61,3 +61,15 @@ describe "#username" do
     username.should == "john"
   end
 end
+
+describe "dev_null" do
+  it "returns 'NUL' on Windows" do
+    PlatformGuard.should_receive(:windows?).and_return(true)
+    dev_null().should == "NUL"
+  end
+
+  it "returns '/dev/null' on non-Windows" do
+    PlatformGuard.should_receive(:windows?).and_return(false)
+    dev_null().should == "/dev/null"
+  end
+end

data/spec/helpers/fixture_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/fixture'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#fixture" do
   before :each do

data/spec/helpers/flunk_spec.rb

@@ -1,12 +1,13 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/helpers/flunk'
 require 'mspec/runner/mspec'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#flunk" do
   before :each do
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
   end
 
   it "raises an SpecExpectationNotMetError unconditionally" do

data/spec/helpers/fs_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/tmp'
-require 'mspec/helpers/fs'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#cp" do
   before :each do
@@ -59,13 +59,11 @@ end
 
 describe Object, "#touch" do
   before :all do
-    @dir = tmp("subdir")
     @name = tmp("subdir/touched.txt")
   end
 
   after :each do
-    File.delete @name if File.exists? @name
-    Dir.rmdir @dir if File.directory? @dir
+    rm_r File.dirname(@name)
   end
 
   it "creates all the directories in the path to the file" do
@@ -115,7 +113,7 @@ describe Object, "#rm_r" do
   end
 
   after :each do
-    File.delete @link if File.exists? @link
+    File.delete @link if File.exists? @link or File.symlink? @link
     File.delete @socket if File.exists? @socket
     File.delete @subfile if File.exists? @subfile
     File.delete @topfile if File.exists? @topfile
@@ -140,17 +138,36 @@ describe Object, "#rm_r" do
     File.exists?(@subfile).should be_false
   end
 
-  it "removes a symlink" do
-    File.symlink @topfile, @link
-    rm_r @link
-    File.exists?(@link).should be_false
-  end
-
-  it "removes a socket" do
-    require 'socket'
-    UNIXServer.new(@socket).close
-    rm_r @socket
-    File.exists?(@socket).should be_false
+  platform_is_not :windows do
+    it "removes a symlink to a file" do
+      File.symlink @topfile, @link
+      rm_r @link
+      File.exists?(@link).should be_false
+    end
+
+    it "removes a symlink to a directory" do
+      File.symlink @subdir1, @link
+      rm_r @link
+      lambda do
+        File.lstat(@link)
+      end.should raise_error(Errno::ENOENT)
+      File.exists?(@subdir1).should be_true
+    end
+
+    it "removes a dangling symlink" do
+      File.symlink "non_existent_file", @link
+      rm_r @link
+      lambda do
+        File.lstat(@link)
+      end.should raise_error(Errno::ENOENT)
+    end
+
+    it "removes a socket" do
+      require 'socket'
+      UNIXServer.new(@socket).close
+      rm_r @socket
+      File.exists?(@socket).should be_false
+    end
   end
 
   it "removes a single directory" do

data/spec/helpers/hash_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/hash'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe Object, "#hash_class" do
   it "returns the Hash class" do

data/spec/helpers/io_spec.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/helpers/io'
-require 'mspec/helpers/fs'
-require 'mspec/helpers/tmp'
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
 
 describe IOStub do
   before :each do
@@ -51,7 +50,7 @@ describe Object, "#new_fd" do
   end
 
   after :each do
-    @io.close unless @io.closed?
+    @io.close if @io and not @io.closed?
     rm_r @name
   end
 
@@ -59,12 +58,29 @@ describe Object, "#new_fd" do
     fd = new_fd @name
     fd.should be_an_instance_of(Fixnum)
 
-    @io = IO.new fd
+    @io = IO.new fd, fmode('w:utf-8')
     @io.sync = true
     @io.print "io data"
 
     IO.read(@name).should == "io data"
   end
+
+  it "accepts an options Hash" do
+    FeatureGuard.stub!(:enabled?).and_return(true)
+    fd = new_fd @name, { :mode => 'w:utf-8' }
+    fd.should be_an_instance_of(Fixnum)
+
+    @io = IO.new fd, fmode('w:utf-8')
+    @io.sync = true
+    @io.print "io data"
+
+    IO.read(@name).should == "io data"
+  end
+
+  it "raises an ArgumentError if the options Hash does not include :mode" do
+    FeatureGuard.stub!(:enabled?).and_return(true)
+    lambda { new_fd @name, { :encoding => "utf-8" } }.should raise_error(ArgumentError)
+  end
 end
 
 describe Object, "#new_io" do
@@ -96,4 +112,57 @@ describe Object, "#new_io" do
     @io.print "io data"
     IO.read(@name).should == "io data"
   end
+
+  it "opens the IO for reading if passed { :mode => 'r' }" do
+    touch(@name) { |f| f.print "io data" }
+    @io = new_io @name, { :mode => "r" }
+    @io.read.should == "io data"
+    lambda { @io.puts "more data" }.should raise_error(IOError)
+  end
+
+  it "opens the IO for writing if passed { :mode => 'w' }" do
+    @io = new_io @name, { :mode => "w" }
+    @io.sync = true
+
+    @io.print "io data"
+    IO.read(@name).should == "io data"
+  end
+end
+
+describe Object, "#fmode" do
+  it "returns the argument unmodified if :encoding feature is enabled" do
+    FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(true)
+    fmode("rb:binary:utf-8").should == "rb:binary:utf-8"
+  end
+
+  it "returns only the file access mode if :encoding feature is not enabled" do
+    FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(false)
+    fmode("rb:binary:utf-8").should == "rb"
+  end
+end
+
+describe Object, "#options_or_mode" do
+  describe "if passed a Hash" do
+    it "returns a mode string if :encoding feature is not enabled" do
+      FeatureGuard.should_receive(:enabled?).with(:encoding).twice.and_return(false)
+      options_or_mode(:mode => "rb:binary").should == "rb"
+    end
+
+    it "returns a Hash if :encoding feature is enabled" do
+      FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(true)
+      options_or_mode(:mode => "rb:utf-8").should == { :mode => "rb:utf-8" }
+    end
+  end
+
+  describe "if passed a String" do
+    it "returns only the file access mode if :encoding feature is not enabled" do
+      FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(false)
+      options_or_mode("rb:binary:utf-8").should == "rb"
+    end
+
+    it "returns the argument unmodified if :encoding feature is enabled" do
+      FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(true)
+      options_or_mode("rb:binary:utf-8").should == "rb:binary:utf-8"
+    end
+  end
 end