github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added poltergeist and a small JS fix.

Browse Source
This commit is contained in:
Mario Visic 2012-05-25 00:06:07 +08:00
parent 817ee8b0e5
commit 4c5d6c92d0
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -36,6 +36,7 @@ group :test do
# gem 'growl-glue' # gem 'growl-glue'
gem 'cucumber-rails', :require => false gem 'cucumber-rails', :require => false
gem 'poltergeist'
gem 'rspec-rails', '~> 2.8.0' gem 'rspec-rails', '~> 2.8.0'
gem 'shoulda-matchers' gem 'shoulda-matchers'

11
Gemfile.lock
View File

@ -147,6 +147,7 @@ GEM
rack rack
ejs (1.0.0) ejs (1.0.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (0.12.10)
excon (0.13.4) excon (0.13.4)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -155,6 +156,8 @@ GEM
factory_girl_rails (1.6.0) factory_girl_rails (1.6.0)
factory_girl (~> 2.5.0) factory_girl (~> 2.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faye-websocket (0.4.5)
eventmachine (>= 0.12.0)
ffi (1.0.11) ffi (1.0.11)
flash_cookie_session (1.1.3) flash_cookie_session (1.1.3)
rails (~> 3.0) rails (~> 3.0)
@ -177,6 +180,7 @@ GEM
haml (3.1.6) haml (3.1.6)
highline (1.6.12) highline (1.6.12)
hike (1.2.1) hike (1.2.1)
http_parser.rb (0.5.3)
httparty (0.8.3) httparty (0.8.3)
multi_json (~> 1.0) multi_json (~> 1.0)
multi_xml multi_xml
@ -230,6 +234,12 @@ GEM
pickle (0.4.10) pickle (0.4.10)
cucumber (>= 0.8) cucumber (>= 0.8)
rake rake
poltergeist (0.6.0)
capybara (~> 1.0)
childprocess (~> 0.3)
faye-websocket (~> 0.4, >= 0.4.4)
http_parser.rb (~> 0.5.3)
multi_json (~> 1.0)
polyglot (0.3.3) polyglot (0.3.3)
rack (1.4.1) rack (1.4.1)
rack-cache (1.2) rack-cache (1.2)
@ -336,6 +346,7 @@ DEPENDENCIES
locomotive_cms! locomotive_cms!
mocha (= 0.9.12) mocha (= 0.9.12)
pickle pickle
poltergeist
rspec-cells rspec-cells
rspec-rails (~> 2.8.0) rspec-rails (~> 2.8.0)
sass-rails (~> 3.2.4) sass-rails (~> 3.2.4)

19
app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee
View File

@ -57,15 +57,16 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
@$('#site_memberships_input').append(@memberships_view.render().el) @$('#site_memberships_input').append(@memberships_view.render().el)
enable_liquid_editing: -> enable_liquid_editing: ->
input = @$('#site_robots_txt') if($('#site_robots_txt').length)
@editor = CodeMirror.fromTextArea input.get()[0], input = @$('#site_robots_txt')
mode: 'liquid' @editor = CodeMirror.fromTextArea input.get()[0],
autoMatchParens: false mode: 'liquid'
lineNumbers: false autoMatchParens: false
passDelay: 50 lineNumbers: false
tabMode: 'shift' passDelay: 50
theme: 'default' tabMode: 'shift'
onChange: (editor) => @model.set(robots_txt: editor.getValue()) theme: 'default'
onChange: (editor) => @model.set(robots_txt: editor.getValue())
save: (event) -> save: (event) ->
if @model.includes_domain(window.location.host) if @model.includes_domain(window.location.host)

3
features/support/env.rb
View File

@ -18,6 +18,7 @@ require 'capybara'
require 'capybara/rails' require 'capybara/rails'
require 'capybara/cucumber' require 'capybara/cucumber'
require 'capybara/session' require 'capybara/session'
require 'capybara/poltergeist'
require 'json_spec/cucumber' require 'json_spec/cucumber'
@ -44,7 +45,7 @@ end
Capybara.default_wait_time = 5 Capybara.default_wait_time = 5
# Capybara.javascript_driver = :rack_test Capybara.javascript_driver = :poltergeist
# Stop endless errors like # Stop endless errors like
# ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16: # ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16: