move to rspec 2

Sentia · Jan 13, 2012 · 315a400 · 315a400
1 parent 8f026bb
commit 315a400
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,6 +2,9 @@
 
 require 'rubygems'
 require 'serenity'
+require 'ruby-debug'
+require 'rspec'
+
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 Ship = Struct.new(:name, :type)
@@ -10,3 +13,9 @@
 def fixture name
   File.join(File.dirname(__FILE__), '..', 'fixtures', name)
 end
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end
+
diff --git a/spec/support/matchers/be_a_document.rb b/spec/support/matchers/be_a_document.rb
@@ -1,5 +1,5 @@
 module Serenity
-  Spec::Matchers.define :be_a_document do
+  RSpec::Matchers.define :be_a_document do
     match do |actual|
       File.exists? actual
     end

diff --git a/spec/support/matchers/contain_in.rb b/spec/support/matchers/contain_in.rb
@@ -1,10 +1,13 @@
+# encoding: utf-8
+
 require "zip/zip"
 
 module Serenity
-  Spec::Matchers.define :contain_in do |xml_file, expected|
+  RSpec::Matchers.define :contain_in do |xml_file, expected|
 
     match do |actual|
       content = Zip::ZipFile.open(actual) { |zip_file| zip_file.read(xml_file) }
+      content.force_encoding("UTF-8")
       content =~ Regexp.new(".*#{Regexp.escape(expected)}.*")
     end