Skip to content
Permalink
Browse files

Merge pull request #8 from petergoldstein/feature/expand_travis_testing

Expanded Travis tests
  • Loading branch information...
bogdan committed Jul 28, 2013
2 parents e40ac55 + 7ac7c34 commit 6a674e87c3c413d2355109867ca22a6820060038
Showing with 38 additions and 97 deletions.
  1. +1 −0 .gitignore
  2. +13 −0 .travis.yml
  3. +19 −8 Gemfile
  4. +0 −80 Gemfile.lock
  5. +0 −1 accept_values_for.gemspec
  6. +5 −8 spec/spec_helper.rb
@@ -1,2 +1,3 @@
pkg
Gemfile.lock
spec.log
@@ -1,7 +1,20 @@
language: ruby
env:
- "RAILS_VERSION=3.0.0"
- "RAILS_VERSION=3.1.0"
- "RAILS_VERSION=3.2.0"
- "RAILS_VERSION=4.0.0"
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- 2.0.0
matrix:
exclude:
- rvm: 1.8.7
env: "RAILS_VERSION=4.0.0"
- rvm: 1.9.2
env: "RAILS_VERSION=4.0.0"
notifications:
email:
- agresso@gmail.com
27 Gemfile
@@ -1,11 +1,22 @@
source "https://rubygems.org"
gem 'activemodel', '>=3.0.0'
gem "bundler"
gem "rspec", ">=0"

group :development do
gem "activerecord", ">=3.0.0"
gem "rspec-rails", ">=2.0.0"
source 'https://rubygems.org'

rails_version = ENV['RAILS_VERSION'] || 'default'

rails = case rails_version
when 'master'
{ :github => 'rails/rails'}
when "default"
'~> 3.2.0'
else
"~> #{rails_version}"
end

gem 'activemodel', rails

group :development, :test do
gem 'rspec', '>=0'
gem 'rails', rails
gem 'rspec-rails', '>=2.0.0'
gem 'jeweler'
gem 'sqlite3-ruby'
end

This file was deleted.

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
".travis.yml",
"Changelog.textile",
"Gemfile",
"Gemfile.lock",
"LICENSE",
"Rakefile",
"Readme.md",
@@ -1,14 +1,14 @@
ENV["RAILS_ENV"] ||= 'test'
require 'sqlite3'
require 'rspec'
require 'rspec/autorun'
require 'active_record'
require 'active_record/railtie'

$LOAD_PATH << "."
require 'lib/accept_values_for'
require 'lib/discover'

require "rspec/rails/adapters"
require "rspec/rails/fixture_support"
require 'rspec/rails'

ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
ActiveRecord::Base.configurations = true
@@ -31,16 +31,13 @@
end

RSpec.configure do |config|
config.use_transactional_examples = true
config.use_transactional_fixtures = true
config.before(:each) do
class ::Group < ActiveRecord::Base
has_many :people

scope :by_char, lambda { |char|
{
:conditions => ["name like ?", char + "%"],
:order => "name"
}
where('name like ?', char + '%').order('name')
}
end

0 comments on commit 6a674e8

Please sign in to comment.
You can’t perform that action at this time.