Merge branch 'master' of github.com:locomotivecms/engine

Gemfile

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

Gemfile.lock

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

README.textile

@@ -55,6 +55,7 @@ Locomotive CMS is an open source project, we encourage contributions. If you hav
 * Install ruby and mongoDB
 * Clone the project <code>git clone git@github.com:locomotivecms/engine.git</code>
 * Setup a virtual host entry for <code>test.example.com</code> to point to localhost
+* Install PhantomJS (Required for the cucumber suite See: https://github.com/jonleighton/poltergeist)
 * Run the tests <code>rake</code>
 * Write your failing tests
 * Make the tests pass

app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee

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

app/views/locomotive/public/sitemaps/show.xml.builder

@@ -11,14 +11,14 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
       if page.templatized?
         page.content_type.entries.visible.each do |c|
           xml.url do
-            xml.loc page_url(page, { :content => c, :host => true })
+            xml.loc page_url(page, { :content => c })
             xml.lastmod c.updated_at.to_date.to_s('%Y-%m-%d')
             xml.priority 0.9
           end
         end
       else
         xml.url do
-          xml.loc page_url(page, { :host => true })
+          xml.loc page_url(page)
           xml.lastmod page.updated_at.to_date.to_s('%Y-%m-%d')
           xml.priority 0.9
         end

features/step_definitions/page_steps.rb

@@ -43,8 +43,8 @@ end
 
 # try to render a page by slug
 When /^I view the rendered page at "([^"]*)"$/ do |path|
-  # If we're running selenium then we need to use a different port
-  if Capybara.current_driver == :selenium
+  # If we're running poltergeist then we need to use a different port
+  if Capybara.current_driver == :poltergeist
     visit "http://#{@site.domains.first}:#{Capybara.server_port}#{path}"
   else
     visit "http://#{@site.domains.first}#{path}"

features/support/env.rb

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