Skip to content

Commit 6868eb4

Browse files
committed
change mocha require statements to take care of mocha warnings during test runs
1 parent 1805525 commit 6868eb4

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ source "http://rubygems.org"
22

33
gemspec
44

5-
gem "jquery-rails"
6-
gem 'mocha'
5+
gem 'jquery-rails'
6+
gem 'mocha', :require => 'mocha/api'

test/generators/install_generator_test.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'test_helper'
22
require 'generators/generators_test_helper'
33
require "generators/backbone/install/install_generator"
4-
require 'mocha'
54

65
class InstallGeneratorTest < Rails::Generators::TestCase
76
include GeneratorsTestHelper

test/test_helper.rb

+3
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111

1212
# For Generators
1313
require 'rails/generators/test_case'
14+
15+
# setup mocha here rather than in individual test files
16+
require 'mocha/setup'

0 commit comments

Comments
 (0)