Permalink
Browse files

Fix RSpec execution

  • Loading branch information...
1 parent 2545e86 commit 98d08cace83f04bc3452ed5b4e2ccb1ef0d172e8 @zedtux committed Feb 3, 2016
View
@@ -54,13 +54,16 @@ group :development do
gem 'rubocop', require: false
end
+group :development, :test do
+ gem 'rspec-rails', '~> 3.0'
+end
+
group :test, :cucumber do
gem 'capybara'
gem 'cucumber-rails', require: false
gem 'database_cleaner'
gem 'email_spec'
gem 'launchy'
- gem 'rspec-rails'
gem 'shoulda-matchers'
gem 'cucumber-timecop', '0.0.3', require: false
gem 'rake'
View
@@ -390,7 +390,7 @@ DEPENDENCIES
rake
redcarpet
responders
- rspec-rails
+ rspec-rails (~> 3.0)
rubocop
selenium-webdriver
shoulda-matchers
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Homebrew::FormulaConflict do
+describe Homebrew::FormulaConflict, type: :model do
describe 'DB' do
it do
should have_db_column(:formula_id).of_type(:integer)
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Homebrew::FormulaDependency do
+describe Homebrew::FormulaDependency, type: :model do
describe 'DB' do
it do
should have_db_column(:formula_id).of_type(:integer)
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Homebrew::Formula do
+describe Homebrew::Formula, type: :model do
describe 'DB' do
it do
should have_db_column(:name).of_type(:string)
View
@@ -4,18 +4,13 @@
require 'simplecov'
require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
- SimpleCov::Formatter::HTMLFormatter,
- Coveralls::SimpleCov::Formatter
-]
SimpleCov.start 'rails' do
add_filter '.bundle/'
end
require File.expand_path('../../config/environment', __FILE__)
require 'rspec/rails'
require 'email_spec'
-require 'rspec/autorun'
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
@@ -24,6 +19,7 @@
RSpec.configure do |config|
config.include(EmailSpec::Helpers)
config.include(EmailSpec::Matchers)
+
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -61,3 +57,10 @@
DatabaseCleaner.clean
end
end
+
+Shoulda::Matchers.configure do |config|
+ config.integrate do |with|
+ with.test_framework :rspec
+ with.library :rails
+ end
+end

0 comments on commit 98d08ca

Please sign in to comment.