Permalink
Browse files

Add proper dependency to refinerycms-core 2.1.0 and refinerycms-acts-…

…as-indexed 1.0.0

Per #40
  • Loading branch information...
1 parent a7a149c commit e027bbc43145e9553a37a154e84438971d7d0b33 @parndt parndt committed Oct 22, 2013
Showing with 21 additions and 4 deletions.
  1. +17 −3 Gemfile
  2. +1 −0 lib/refinery/search.rb
  3. +1 −0 refinerycms-search.gemspec
  4. +2 −1 spec/spec_helper.rb
View
20 Gemfile
@@ -5,9 +5,23 @@ gemspec
gem 'refinerycms', '~> 2.1.0'
gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
-group :test do
- gem 'refinerycms-testing', :github => 'refinery/refinerycms', :branch => '2-1-stable'
-end
+group :development, :test do
+ gem 'refinerycms-testing', '~> 2.1.0'
+ gem 'poltergeist'
+
+ platforms :jruby do
+ gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'activerecord-jdbcmysql-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter'
+ gem 'jruby-openssl'
+ end
+
+ unless defined?(JRUBY_VERSION)
+ gem 'sqlite3'
+ gem 'mysql2'
+ gem 'pg'
+ end
+>>>>>>> Add proper dependency to refinerycms-core 2.1.0 and refinerycms-acts-as-indexed 1.0.0
@keithpitty

keithpitty Oct 22, 2013

@parndt is this line left over from a merge?

@parndt

parndt Oct 22, 2013

Owner

Unfortunately, see 0d6cafc for the solution.

I feel so amateur. :)

# Database Configuration
unless ENV['TRAVIS']
View
@@ -1,4 +1,5 @@
require "refinerycms-core"
+require 'refinerycms-acts-as-indexed'
module Refinery
autoload :SearchGenerator, 'generators/refinery/search_generator'
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
s.test_files = `git ls-files -- spec/*`.split("\n")
s.add_dependency 'refinerycms-core', '~> 2.1.0'
+ s.add_dependency 'refinerycms-acts-as-indexed', '~> 1.0.0'
end
View
@@ -22,7 +22,8 @@
end
# Set javascript driver for capybara
-Capybara.javascript_driver = :selenium
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories including factories.

0 comments on commit e027bbc

Please sign in to comment.