Merge pull request #40 from parndt/feature/rails-5

WIP: Feature/rails 5

Author: bricesanchez

.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
+dist: trusty
 cache: bundler
 bundler_args: --without development
+addons:
+  apt:
+    packages:
+      - google-chrome-stable
 before_script:
   - sh -e /etc/init.d/xvfb start
   - bin/rake refinery:testing:dummy_app
@@ -12,8 +17,7 @@ notifications:
   webhooks:
     - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 rvm:
-  - 2.3.1
-  - 2.2
-  - 2.1
-  - 2.0.0
+  - 2.4.1
+  - 2.3.3
+  - 2.2.6
 sudo: false

Gemfile

@@ -13,7 +13,9 @@ end
 group :test do
   gem 'pry'
   gem 'launchy'
-  gem 'selenium-webdriver', '~> 2.43'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'listen'
 end
 
 # Database Configuration

lib/refinery/wymeditor/engine.rb

@@ -1,7 +1,7 @@
 module Refinery
   module Wymeditor
     class Engine < ::Rails::Engine
-      include Refinery::Engine
+      extend Refinery::Engine
 
       isolate_namespace Refinery
       engine_name :refinery_wymeditor
@@ -14,6 +14,7 @@ class Engine < ::Rails::Engine
           wymeditor/lang/*
           wymeditor/skins/refinery/*
           wymeditor/skins/refinery/**/*
+          refinery/wymeditor.js
         )
       end
 

readme.md

@@ -19,7 +19,7 @@ You can also switch to "source" view and edit HTML manually if the visual editor
 Simply put this in the Gemfile of your Refinery application:
 
 ```ruby
-gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.7']
+gem 'refinerycms-wymeditor', ['~> 2.0', '>= 2.0.0']
 ```
 
 Now, run `bundle install`

refinerycms-wymeditor.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-wymeditor}
-  s.version           = '1.1.0'
+  s.version           = '2.0.0'
   s.summary           = %q{WYMeditor support for Refinery CMS}
   s.description       = %q{This extension adds WYMeditor support to Refinery CMS for visual editing.}
   s.email             = %q{gems@p.arndt.io}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files -- '*[^.pem]'`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency    'refinerycms-core', ['>= 3.0.0', '< 5.0']
+  s.add_dependency    'refinerycms-core', ['>= 4.0.0.dev', '< 5.0']
 
   s.cert_chain  = ['certs/parndt.pem']
   if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)

spec/spec_helper.rb

@@ -18,7 +18,17 @@
 
 # set javascript driver for capybara
 require 'selenium-webdriver'
-Capybara.javascript_driver = :selenium
+
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+end
+
+Capybara.javascript_driver = :chrome
+
+Capybara.configure do |config|
+  config.default_max_wait_time = ENV['CAPYBARA_MAX_WAIT_TIME'] || 10 # seconds
+  config.default_driver        = :selenium
+end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories including factories.