Permalink
Browse files

Fixed for Travis

  • Loading branch information...
1 parent ec149b0 commit 350a189fa8505df251b8c207eab6d3156a82e2fb @bcardarella bcardarella committed Aug 13, 2012
Showing with 18 additions and 238 deletions.
  1. +1 −0 .gitignore
  2. +0 −7 .travis.yml
  3. +3 −13 Gemfile
  4. +0 −165 Gemfile.lock
  5. +0 −20 MIT-LICENSE
  6. +5 −21 Rakefile
  7. +0 −3 easy_auth.gemspec
  8. +9 −9 spec/spec_helper.rb
View
@@ -6,4 +6,5 @@ spec/dummy/log/*.log
spec/dummy/tmp/
spec/dummy/.sass-cache
bundler_stubs/*
+*.lock
bin/*
View
@@ -3,16 +3,9 @@ rvm:
- 1.9.2
- 1.9.3
- ree
- - jruby
- - jruby-19mode
-
-script: bundle exec rspec spec
before_script:
- bundle exec rake db:create
- bundle exec rake db:migrate
env: RAILS_ENV=test
-
-notifications:
- email: false
View
@@ -1,17 +1,7 @@
source "http://rubygems.org"
-# Declare your gem's dependencies in easy_auth.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+if RUBY_VERSION >= '1.9.2' && RUBY_ENGINE == 'ruby'
+ gem 'debugger'
+end
gemspec
-
-# jquery-rails is used by the dummy application
gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
View
@@ -1,165 +0,0 @@
-PATH
- remote: .
- specs:
- easy_auth (0.0.5)
- bcrypt-ruby (~> 3.0.0)
- rails (~> 3.2.1)
-
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (3.2.7)
- actionpack (= 3.2.7)
- mail (~> 2.4.4)
- actionpack (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.0)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.7)
- activesupport (= 3.2.7)
- builder (~> 3.0.0)
- activerecord (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
- activesupport (3.2.7)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- addressable (2.3.2)
- arel (3.0.2)
- bcrypt-ruby (3.0.1)
- bourne (1.1.2)
- mocha (= 0.10.5)
- builder (3.0.0)
- capybara (1.1.2)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 0.1.4)
- capybara-email (0.1.2)
- childprocess (0.3.5)
- ffi (~> 1.0, >= 1.0.6)
- columnize (0.3.6)
- debugger (1.2.0)
- columnize (>= 0.3.1)
- debugger-linecache (~> 1.1.1)
- debugger-ruby_core_source (~> 1.1.3)
- debugger-linecache (1.1.2)
- debugger-ruby_core_source (>= 1.1.1)
- debugger-ruby_core_source (1.1.3)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- factory_girl (4.0.0)
- activesupport (>= 3.0.0)
- factory_girl_rails (4.0.0)
- factory_girl (~> 4.0.0)
- railties (>= 3.0.0)
- ffi (1.1.4)
- hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- json (1.7.4)
- launchy (2.1.2)
- addressable (~> 2.3)
- libwebsocket (0.1.5)
- addressable
- mail (2.4.4)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- metaclass (0.0.1)
- mime-types (1.19)
- mocha (0.10.5)
- metaclass (~> 0.0.1)
- multi_json (1.3.6)
- nokogiri (1.5.5)
- polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
- rack (>= 1.0)
- rails (3.2.7)
- actionmailer (= 3.2.7)
- actionpack (= 3.2.7)
- activerecord (= 3.2.7)
- activeresource (= 3.2.7)
- activesupport (= 3.2.7)
- bundler (~> 1.0)
- railties (= 3.2.7)
- railties (3.2.7)
- actionpack (= 3.2.7)
- activesupport (= 3.2.7)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
- rdoc (3.12)
- json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.2)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.1)
- rspec-rails (2.11.0)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.11.0)
- rubyzip (0.9.9)
- selenium-webdriver (2.25.0)
- childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
- multi_json (~> 1.0)
- rubyzip
- sprockets (2.1.3)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
- thor (0.15.4)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- valid_attribute (1.2.0)
- xpath (0.1.4)
- nokogiri (~> 1.3)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- bourne
- capybara
- capybara-email
- debugger
- easy_auth!
- factory_girl_rails
- jquery-rails
- launchy
- rspec-rails
- sqlite3
- valid_attribute
View
@@ -1,20 +0,0 @@
-Copyright 2012 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -1,26 +1,10 @@
-#!/usr/bin/env rake
-begin
- require 'bundler/setup'
-rescue LoadError
- puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
- require 'rdoc/task'
-rescue LoadError
- require 'rdoc/rdoc'
- require 'rake/rdoctask'
- RDoc::Task = Rake::RDocTask
-end
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+Bundler::GemHelper.install_tasks
-RDoc::Task.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'EasyAuth'
- rdoc.options << '--line-numbers'
- rdoc.rdoc_files.include('README.rdoc')
- rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new('default') do |t|
+ t.pattern = FileList['spec/**/*_spec.rb']
end
APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
View
@@ -26,7 +26,4 @@ Gem::Specification.new do |s|
s.add_development_dependency 'factory_girl_rails'
s.add_development_dependency 'bourne'
s.add_development_dependency 'launchy'
- if RUBY_VERSION > '1.9' && RUBY_ENGINE == 'ruby'
- s.add_development_dependency 'debugger'
- end
end
View
@@ -1,28 +1,28 @@
-# Configure Rails Envinronment
+require 'rubygems'
+begin
+ require 'debugger'
+rescue LoadError
+end
+require 'bundler/setup'
+
ENV['RAILS_ENV'] = 'test'
require File.expand_path('../dummy/config/environment.rb', __FILE__)
-
-require 'rspec/rails'
require 'capybara/rspec'
+require 'rspec/rails'
require 'capybara/email/rspec'
require 'valid_attribute'
require 'factory_girl_rails'
-if RUBY_VERSION > '1.9' && RUBY_ENGINE == 'ruby'
- require 'debugger'
-end
require 'bourne'
ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
Dir[File.join(ENGINE_RAILS_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
Dir[File.join(ENGINE_RAILS_ROOT, 'spec/config/**/*.rb')].each { |f| require f }
RSpec.configure do |config|
config.mock_with :mocha
config.use_transactional_fixtures = true
- config.include Factory::Syntax::Methods
+ config.include FactoryGirl::Syntax::Methods
config.before(:each, :type => :request) do
Dir[File.join(ENGINE_RAILS_ROOT, 'spec/requests/step_helpers/**/*.rb')].each { |f| require f }

0 comments on commit 350a189

Please sign in to comment.