Skip to content

Commit

Permalink
Update for rails 4.2.0
Browse files Browse the repository at this point in the history
Remove useless .rbenv dot files

Use binstubs for travis config

Chmod 755 to rake and rspec
  • Loading branch information
Brice Sanchez committed Feb 24, 2015
1 parent fc14e71 commit 3379f1e
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 20 deletions.
16 changes: 9 additions & 7 deletions .travis.yml
@@ -1,10 +1,9 @@
language: ruby
cache: bundler
sudo: false
bundler_args: --without development
before_script:
- "sh -e /etc/init.d/xvfb start"
- "bundle exec rake refinery:testing:dummy_app"
script:
- "DISPLAY=:99.0 bundle exec rspec spec"
before_script: "bin/rake refinery:testing:dummy_app"
script: "bin/rspec spec"
notifications:
email: true
irc:
Expand All @@ -17,9 +16,12 @@ notifications:
on_failure: always
rooms:
- secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
webhooks:
- https://webhooks.gitter.im/e/b5d48907cdc89864b874
env:
- DB=postgresql
- DB=mysql
rvm:
- 2.1.0
- 2.0.0
- 2.2
- 2.1
- 2.0.0
17 changes: 10 additions & 7 deletions Gemfile
@@ -1,16 +1,19 @@
source "http://rubygems.org"
source "https://rubygems.org"

gemspec

gem 'refinerycms', github: 'refinery/refinerycms'
gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n'
gem 'refinerycms-settings', github: 'refinery/refinerycms-settings'
git "https://github.com/refinery/refinerycms", branch: "master" do
gem 'refinerycms'

gem "mime-types", "~> 1.25"
group :development, :test do
gem 'refinerycms-testing'
end
end

group :test do
gem 'refinerycms-testing', github: 'refinery/refinerycms'
gem 'poltergeist'
gem 'pry'
gem 'launchy'
gem 'selenium-webdriver'
end

# Database Configuration
Expand Down
16 changes: 16 additions & 0 deletions bin/rake
@@ -0,0 +1,16 @@
#!/usr/bin/env ruby
#
# This file was generated by Bundler.
#
# The application 'rake' is installed as part of a gem, and
# this file is here to facilitate running it.
#

require 'pathname'
ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)

require 'rubygems'
require 'bundler/setup'

load Gem.bin_path('rake', 'rake')
16 changes: 16 additions & 0 deletions bin/rspec
@@ -0,0 +1,16 @@
#!/usr/bin/env ruby
#
# This file was generated by Bundler.
#
# The application 'rspec' is installed as part of a gem, and
# this file is here to facilitate running it.
#

require 'pathname'
ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)

require 'rubygems'
require 'bundler/setup'

load Gem.bin_path('rspec-core', 'rspec')
4 changes: 2 additions & 2 deletions refinerycms-news.gemspec
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|

s.add_dependency 'refinerycms-core', '~> 3.0.0'
s.add_dependency 'refinerycms-settings', '~> 3.0.0'
s.add_dependency 'friendly_id', '~> 5.0.1'
s.add_dependency 'globalize', '~> 4.0.0'
s.add_dependency 'friendly_id', '~> 5.1.0'
s.add_dependency 'globalize', ['>= 4.0.0', '< 5.2']
s.add_dependency 'acts_as_indexed', '~> 0.8.0'
end
5 changes: 1 addition & 4 deletions spec/spec_helper.rb
Expand Up @@ -7,20 +7,17 @@

require 'rspec/rails'
require 'capybara/rspec'
require 'factory_girl_rails'

Rails.backtrace_cleaner.remove_silencers!

RSpec.configure do |config|
config.mock_with :rspec
config.treat_symbols_as_metadata_keys_with_true_values = true
config.filter_run :focus => true
config.run_all_when_everything_filtered = true
end

# set javascript driver for capybara
require 'capybara/poltergeist'
Capybara.javascript_driver = :poltergeist
Capybara.javascript_driver = :selenium

# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories including factories.
Expand Down

0 comments on commit 3379f1e

Please sign in to comment.