From 3935a7cf5ff011ed8dc83c613583291206233637 Mon Sep 17 00:00:00 2001 From: Max Meyer Date: Mon, 8 Jun 2015 04:12:00 +0200 Subject: [PATCH] Use capybara to make javascript testing possible --- Gemfile | 3 +++ .../features/javascript-testing.feature | 18 +++++++++++++ middleman-core/features/support/env.rb | 3 +++ .../fixtures/javascript-app/config.rb | 0 .../fixtures/javascript-app/source/index.html | 17 ++++++++++++ .../step_definitions/server_steps.rb | 27 ++++++++++--------- middleman-core/middleman-core.gemspec | 2 +- 7 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 middleman-core/features/javascript-testing.feature create mode 100644 middleman-core/fixtures/javascript-app/config.rb create mode 100644 middleman-core/fixtures/javascript-app/source/index.html diff --git a/Gemfile b/Gemfile index 4ae46daf..f34fbaec 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,9 @@ gem 'sinatra', '>= 1.4', require: false gem 'redcarpet', '>= 3.1', require: false unless RUBY_ENGINE == 'jruby' gem 'asciidoctor', '~> 0.1', require: false +# To test javascript +gem 'poltergeist', '~> 1.6.0', require: false + # For less, note there is no compatible JS runtime for windows gem 'therubyracer', '>= 0.12', platforms: :ruby gem 'therubyrhino', '>= 2.0', platforms: :jruby diff --git a/middleman-core/features/javascript-testing.feature b/middleman-core/features/javascript-testing.feature new file mode 100644 index 00000000..031d70d0 --- /dev/null +++ b/middleman-core/features/javascript-testing.feature @@ -0,0 +1,18 @@ +Feature: Test a site with javascript included + + As a software developer + I want to develop a site using javascript + I would like to have a server step rendering javascript correctly in order to test it + + @javascript + Scenario: Existing app with javascript + Given the Server is running at "javascript-app" + When I go to "/index.html" + Then I should see: + """ + Local Hour + """ + And I should see: + """ + Local Minutes + """ diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb index ba524651..8213b7c7 100644 --- a/middleman-core/features/support/env.rb +++ b/middleman-core/features/support/env.rb @@ -4,6 +4,9 @@ ENV["AUTOLOAD_SPROCKETS"] = "false" require 'simplecov' SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..')) +require 'capybara/poltergeist' +Capybara.javascript_driver = :poltergeist + require 'coveralls' Coveralls.wear! diff --git a/middleman-core/fixtures/javascript-app/config.rb b/middleman-core/fixtures/javascript-app/config.rb new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/javascript-app/source/index.html b/middleman-core/fixtures/javascript-app/source/index.html new file mode 100644 index 00000000..339bac14 --- /dev/null +++ b/middleman-core/fixtures/javascript-app/source/index.html @@ -0,0 +1,17 @@ + + + + Title + + + + + + diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 24f01b94..b605e4ce 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -1,6 +1,7 @@ # encoding: UTF-8 -require 'rack/test' +require 'rspec/expectations' +require 'capybara/cucumber' Given /^a clean server$/ do @initialize_commands = [] @@ -57,8 +58,7 @@ Given /^the Server is running$/ do end end - app_rack = @server_inst.class.to_rack_app - @browser = ::Rack::Test::Session.new(::Rack::MockSession.new(app_rack)) + Capybara.app = @server_inst.class.to_rack_app end Given /^the Server is running at "([^\"]*)"$/ do |app_path| @@ -72,60 +72,61 @@ end When /^I go to "([^\"]*)"$/ do |url| in_current_dir do - @browser.get(URI.encode(url)) + visit(URI.encode(url).to_s) end end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| in_current_dir do - expect{ @browser.get(URI.encode(url)) }.to_not raise_exception + + expect{ visit(URI.encode(url).to_s) }.to_not raise_exception end end Then /^the content type should be "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.content_type).to start_with(expected) + expect(page.response_headers['Content-Type']).to start_with expected end end Then /^I should see "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to include(expected) + expect(page.body).to include expected end end Then /^I should see '([^\']*)'$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to include(expected) + expect(page.body).to include expected end end Then /^I should see:$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to include(expected) + expect(page.body).to include expected end end Then /^I should not see "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to_not include(expected) + expect(page.body).not_to include expected end end Then /^I should not see:$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to_not include(expected.chomp) + expect(page.body).not_to include expected end end Then /^the status code should be "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.status).to eq expected.to_i + expect(page.status_code).to eq expected.to_i end end Then /^I should see "([^\"]*)" lines$/ do |lines| in_current_dir do - expect(@browser.last_response.body.chomp.split($/).length).to eq(lines.to_i) + expect(page.body.chomp.split($/).length).to eq lines.to_i end end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 03e468bd..0e8e9fa7 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency("hooks", ["~> 0.3"]) # Builder - s.add_dependency("rack-test", ["~> 0.6.2"]) + s.add_dependency("capybara", ["~> 2.4.4"]) # CLI s.add_dependency("thor", [">= 0.15.2", "< 2.0"])