Permalink
Browse files

fallback to rspec mocks, remove flexmock

Travis CI seems to have trouble running flexmock within rspec, so we
are falling back to rspec mocks.
  • Loading branch information...
1 parent e64963a commit 14b8960184d1c9fe3f54684a0969b62bef12a2f0 @jimweirich committed Sep 14, 2012
View
2 .rspec
@@ -1 +1 @@
--Ispec -Iexamples --color
+-Ilib -Ispec -Iexamples --color
View
@@ -1,7 +1,3 @@
source 'https://rubygems.org'
gem 'rspec', '>= 2.0'
gem 'rake', '>= 0.9.2.2'
-
-group :test do
- gem 'flexmock', '~> 1.0.2', :require => nil
-end
View
@@ -2,7 +2,6 @@ GEM
remote: https://rubygems.org/
specs:
diff-lcs (1.1.3)
- flexmock (1.0.2)
rake (0.9.2.2)
rspec (2.11.0)
rspec-core (~> 2.11.0)
@@ -17,6 +16,5 @@ PLATFORMS
ruby
DEPENDENCIES
- flexmock (~> 1.0.2)
rake (>= 0.9.2.2)
rspec (>= 2.0)
View
@@ -52,12 +52,7 @@ desc "Run all the examples"
task :examples => [:specs, :examples1, :examples2]
desc "Run the RSpec 2 specs and examples"
-task :ex2 => [:bundleshow, :specs, :examples2]
-
-task :bundleshow do
- sh "bundle show"
-end
-
+task :ex2 => [:specs, :examples2]
desc "Run the specs"
task :specs do
@@ -2,6 +2,6 @@
require 'rspec/given'
-RSpec.configure do |c|
- c.mock_with :flexmock
+RSpec.configure do |config|
+# config.mock_with :flexmock
end
@@ -1,17 +1,17 @@
require 'rspec/given'
-require 'spec_helper'
-require 'flexmock/rspec'
+require 'example_helper'
describe "And" do
+
Given(:info) { [] }
- Given(:mock) { flexmock("mock") }
describe "And is called after Then" do
- Given { mock.should_receive(:and_ran).once }
+ Given(:m) { mock("mock") }
+ Given { m.should_receive(:and_ran) }
Then { info << "T" }
And {
info.should == ["T"]
- mock.and_ran
+ m.and_ran
}
end
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'example_helper'
describe "Focused Line" do
it "runs only a single test" do
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'example_helper'
describe "Line Spec" do
@@ -1,5 +1,5 @@
require 'rspec/given'
-require 'spec_helper'
+require 'example_helper'
require 'stack'
describe Stack do
View
@@ -1,5 +1 @@
require 'rspec/given'
-
-RSpec.configure do |c|
- c.mock_with :flexmock
-end

0 comments on commit 14b8960

Please sign in to comment.