qlive-rspec 0.3.1 → 0.4.0

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in qlive-headless.gemspec
 gemspec

data/README.md

@@ -5,23 +5,22 @@ This builds on the [qlive-rails](https://github.com/proxv/qlive-rails) gem. If y
 this gem will let you run your qlive tests in both a browser and headlessly as an rspec example/test.
 
 
-Qlive-rspec has relatively heavy dependencies: virtual X11 frame buffer, headless webkit, capybara, and rspec.
-If this doesn't work for you, it should be possible to incorporate your qlive tests into other automated testing
-or continuous integration enviornments (eg, with a selenium-related library.)
+## Installation
 
 
+### PhantomJS and Poltergeist
 
-## Headless Webkit
+Qlive-rspec depends on the [Poltergeist gem](https://github.com/jonleighton/poltergeist),
+which uses [PhantomJS](http://phantomjs.org/) as its headless webkit browser.
 
 
+You will need to install PhantomJS. Up-to-date binaries are usually available
+for [download](http://phantomjs.org/download.html) so it is a pretty easy install.
 
-* Install webkit-qt and xvfb on your system. Eg:
-<pre>sudo aptitude install libqt4-dev xvfb</pre>
 
-note: See [capybara-webkit](https://github.com/thoughtbot/capybara-webkit) and [headless](https://github.com/leonid-shevtsov/headless) gems for more detailed instructions.
+### Gemfile
 
-
-* Add qlive-rails and qlive-rspec to your Gemfile as follows:
+Add poltergeist, qlive-rails, and qlive-rspec to your Gemfile as follows:
 
     ```ruby
     group :test, :development do
@@ -29,12 +28,16 @@ note: See [capybara-webkit](https://github.com/thoughtbot/capybara-webkit) and [
     end
 
     group :test do
-      gem 'capybara-webkit', '~> 0.10'
-      gem 'qlive-rspec'
+      gem 'poltergeist', '~> 1.1'
+      gem 'qlive-rspec', '~> 0.4.0'
     end
     ```
 
-* As in qlive-rails, mount the engine in routes.rb:
+
+### Routes
+
+Mount the engine in routes.rb:
+
 
     ```ruby
     if Rails.env != 'production'
@@ -53,7 +56,7 @@ create ``spec/qunits/qunits_spec.rb``:
   require "spec_helper.rb"  
   include Qlive::Runner
   
-  Capybara.current_driver = :webkit
+  Capybara.current_driver = :poltergeist
 
   describe "qunits" do
     run_qlive
@@ -61,8 +64,12 @@ create ``spec/qunits/qunits_spec.rb``:
 ```
 
 
-* It will now run as a normal rspec example:
-<pre>rspec spec/qunits</pre>
+* Your qunit tests will now run as a normal rspec example:
+``rspec spec/qunits``
+
+
+* Tip: you can run just specific qlive suites using the rspec --example option and the qlive suite name. Eg: Running qunits for just the suite Posts::AsUserQlive could be run with:
+``rspec spec/qunits --example 'posts/as_user'``
 
 
 ## Sauce
@@ -156,10 +163,6 @@ Qlive.setup[:before_suites] lambda { my_setup_code }
 Qlive.setup[:after_suites] lambda { my_teardown_code }
 </pre>
 
-* Optionally set xvfb/headless gem to a custom configuration hash with: ``Qlive.setup[:headless_config] = my_settings_hash``
-
-* Optionally disable xvfb with ``Qlive.setup[:start_xvfb] = false`` if you plan on configuring it externally
-
 * Optionally change per-page timeout in seconds with: ``Qlive.setup[:capybara_wait_time] = 30``
 
 * Optionally pass in ``:before_each`` and ``:after_each`` proc/lambda in ``run_qlive`` (called in qunits_spec.rb)

data/lib/qlive/matchers.rb

@@ -1,7 +1,7 @@
 module Qlive
   module Matchers
     def self.add_matchers
-      ::RSpec::Matchers.define :pass_qunit_tests do |failure_text|
+      ::RSpec::Matchers.define :pass_qunit_tests do |suite, failure_text|
         match do |page_actual|
           url = page_actual.current_url
           passed = page_actual.find('#qunit-testresult .passed').text.to_i rescue 0

data/lib/qlive/runner.rb

@@ -1,9 +1,7 @@
 require 'capybara/rspec'
-require 'headless'  # https://github.com/leonid-shevtsov/headless
 require 'qlive/matchers'
 require "#{Qlive::Engine.root}/app/helpers/qlive/suites_helper.rb"
 
-
 module Qlive
   module Runner
 
@@ -16,31 +14,26 @@ module Qlive
 
         # todo: support suite selection by allowing directory and path names, not just suite names. (both absolute and relative to base_path)
         desired_suites_by_name = args[:suites] || Qlive::Registry.find_suites.keys
-        describe "qlive", :type => :request do
+        describe "qlive", :type => :feature do
           before(:all) do
             Qlive.setup[:before_suites].call if Qlive.setup[:before_suites]
-            if Qlive.setup[:start_xvfb] && Capybara.current_driver == :webkit
-              @headless = ::Headless.new(Qlive.setup[:headless_config])
-              @headless.start
-            end
-          end
+           end
 
-          desired_suites_by_name.each do |desired_suite|
+          desired_suites_by_name.each_with_index do |desired_suite, ndx|
             suite = resolve_suite(desired_suite)
             raise "Could not find qlive suite for: #{desired_suite}" unless suite
-            describe "suite '#{suite.name}'" do
+
+            describe "suite ##{ndx + 1} '#{suite.suite_name}'" do
               extend Qlive::SuitesHelper
 
-              def visit_qunit_page(suite_name, href)
+              def visit_qunit_page(suite, href)
                 using_wait_time(Qlive.setup[:capybara_wait_time]) do  # perhaps let individual suites override this value
-                  Qlive.logger.info "Qlive sending capybara to run '#{suite_name}' on #{href}"
+                  Qlive.logger.info "Qlive sending capybara to run '#{suite.suite_name}' on #{href}"
                   visit href
                   page.html.should_not be_nil
-                  page.wait_until(Qlive.setup[:capybara_wait_time]) do # hmmmm
-                    page.evaluate_script('!!window.qunitComplete')
-                  end
+                  page.find("#qlive-complete")
                   failure_text = page.evaluate_script("$('li.fail li.fail').text();")
-                  page.should pass_qunit_tests(failure_text)
+                  page.should pass_qunit_tests(suite, failure_text)
                 end
               end
 
@@ -52,7 +45,7 @@ module Qlive
 
               hrefs_for_suite(suite).each do |href|
                 it "should pass qunit tests when visiting: #{href}" do
-                  visit_qunit_page(suite.name, href)
+                  visit_qunit_page(suite, href)
                 end
               end
 
@@ -64,17 +57,11 @@ module Qlive
 
           after(:all) do
             Qlive.setup[:after_suites].call if Qlive.setup[:after_suites]
-            if @headless
-              puts "\nGetting rough with headless webkit_server. In the event of a fatal IO error, use your judgement regarding calling the police."
-              @headless.destroy
-            end
           end
-
         end
       end
 
       def resolve_suite(desired_suite)
-        #todo: if it ends in .rb, check for the file, and use the path to get the suite
         Qlive::Registry.build_suite(desired_suite)
       end
     end

data/lib/qlive-rspec/version.rb

@@ -1,3 +1,3 @@
 module QliveRspec
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/qlive-rspec.rb

@@ -3,10 +3,5 @@ require "qlive/runner"
 
 
 module QliveRspec
-  Qlive.setup[:start_xvfb] = true unless Qlive.setup.has_key?(:start_xvfb)
-  Qlive.setup[:headless_config] = {
-    :display => 99
-    # :destroy_at_exit => true, :reuse => false
-  }
   Qlive.setup[:capybara_wait_time] = 30
 end

data/qlive-rspec.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = QliveRspec::VERSION
 
-  gem.add_dependency "qlive-rails", "~> 0.2.0"
-  gem.add_dependency "rspec-rails", "~> 2.8"
-  gem.add_dependency "headless", "~> 0.3"
-  gem.add_development_dependency "rspec-rails", "~> 2.8"
+  gem.add_dependency "qlive-rails", "~> 0.4.0"
+  gem.add_dependency "rspec-rails", "~> 2.11"
+  gem.add_dependency "poltergeist", "~> 1.1"
+  gem.add_development_dependency "rspec-rails", "~> 2.11"
   gem.add_development_dependency "factory_girl_rails", "~> 3.5"
 end

data/spec/dummy/Gemfile

@@ -1,31 +1,30 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.3'
-gem 'sqlite3'
-gem 'haml-rails'
+gem 'rails', '3.2.12'
+gem 'sqlite3', '1.3.7'
+gem 'haml-rails', '0.3.4'
 
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
+  gem 'sass-rails', '3.2.5'
+  gem 'coffee-rails', '3.2.2'
+  gem 'uglifier', '1.0.3'
 end
 
-gem 'jquery-rails'
-gem 'backbone-on-rails'
+gem 'jquery-rails', '2.0.2'
+gem 'backbone-on-rails', '0.9.2.1'
 
 group :development do
 end
 
+qlive_gems_path = File.expand_path('../../../..', __FILE__)
+
 group :test, :development do
   gem 'factory_girl_rails', '3.5.0'
-  gem 'qlive-rails', :path => "#{ENV['PROXV_REPOS']}/qlive/gems/qlive-rails", :require => 'qlive/engine' # https://github.com/proxv/qlive # tmp - del
-  #gem 'qlive-rails', :require => 'qlive/engine' # https://github.com/proxv/qlive # tmp - restore
+  gem 'qlive', :path => "#{qlive_gems_path}/qlive"
+  gem 'qlive-rails', :path => "#{qlive_gems_path}/qlive-rails", :require => 'qlive/engine'
 end
 
 group :test do
-  gem 'rspec-rails', '~> 2.8.1'
-  gem 'capybara-webkit', '0.10.0'
-  gem 'headless', '~> 0.2'
-  gem 'qlive', :path => "#{ENV['PROXV_REPOS']}/qlive/gems/qlive" # tmp - del
-  gem 'qlive-rspec', :path => File.expand_path('../../..', __FILE__)
+  gem 'rspec-rails', '2.11.0'
+  gem 'poltergeist', '1.1.0'
 end

data/spec/dummy/README.md

@@ -14,6 +14,7 @@ http://localhost/qlive
 
 ## Run dummy app qlive suites headlessly
 ```
+cd qlive/gems/qlive-rspec
 rspec spec/qunits
 ```
 

data/spec/dummy/spec/qunits/adding_todos/long_list_qlive.rb

@@ -0,0 +1,14 @@
+module AddingTodos
+  class LongListQlive
+    include Qlive::Suite
+
+    def pages_to_test
+      '/#colors/green'
+    end
+
+    def before_each_suite(rack_request)
+      Todo.destroy(Todo.all.map(&:id))
+      20.times { FactoryGirl.create(:todo) }
+    end
+  end
+end

data/spec/dummy/spec/qunits/adding_todos/short_list_qlive.rb

@@ -0,0 +1,14 @@
+module AddingTodos
+  class ShortListQlive
+    include Qlive::Suite
+
+    def pages_to_test
+      [ '/#colors/blue', '/#colors/brown' ]
+    end
+
+    def before_each_suite(rack_request)
+      Todo.destroy(Todo.all.map(&:id))
+      4.times { FactoryGirl.create(:todo) }
+    end
+  end
+end

data/spec/dummy/spec/qunits/adding_todos/test-ajax-creation.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
   module("test-ajax-creation.js");
 
   asyncTest("create new todo item", 2, function() {
-    waitFor('items load', function() {
+    waitFor('items to load', function() {
       return $('#todo-list li').length > 3;
     }).then(function() {
         var startCount = $('#todo-list li').length;

data/spec/dummy/spec/qunits/qunit_support/qunit-logger.js

@@ -4,7 +4,7 @@ window.qlog = function(msg, obj) {
     domConsole = $('<ol id="qlog">Test Log:</ol>').appendTo($('.qlive-structure'));
   }
   if (console && console.log) {
-    console.log(msg, obj);
+    console.log(msg, obj || '');
   }
   var li = $('<li>' + msg + '</li>');
   if (obj) {

data/spec/dummy/spec/qunits/qunit_support/wait-for.js

@@ -1,4 +1,4 @@
-var DEFAULT_MAX_DURATION = 12000;
+var DEFAULT_MAX_DURATION = 8000;
 
 window.waitFor = function(title, checkFn, opts) {
   var qunitCurrent = QUnit.config.current; // something is clearing this. Not yet sure why.
@@ -43,4 +43,5 @@ function failQunit(msg) {
   ok(false, msg);
   start();
   window.qunitComplete = true;
+  window.endQlive && window.endQlive();
 }

data/spec/qunits_spec.rb

@@ -1,4 +1,5 @@
 require_relative './spec_helper.rb'
+require_relative '../lib/qlive-rspec'
 
 include Qlive::Runner
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ ENV["RAILS_ENV"] = 'test'
 ENV["DUMMY_HOME"] = dummy_home = File.expand_path("../dummy",  __FILE__)
 require File.expand_path("#{dummy_home}/config/environment.rb",  __FILE__)
 require 'rspec/rails'
+require 'capybara/poltergeist'
 
 Dir["#{dummy_home}/spec/spec_support/**/*.rb"].each {|f| require f}   # I don't care about Windows
 
@@ -9,5 +10,5 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 end
 
-Capybara.default_driver = :webkit
+Capybara.default_driver = :poltergeist
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qlive-rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,55 +9,75 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qlive-rails
-  requirement: &2152318220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152318220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152317560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *2152317560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: headless
-  requirement: &2152316820 !ruby/object:Gem::Requirement
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152316820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152315960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *2152315960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &2152315200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: *2152315200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: Run qlive-rails qunit javascript tests headlessly alongside your normal
   rspec integration examples
 email:
@@ -145,7 +170,8 @@ files:
 - spec/dummy/script/test
 - spec/dummy/spec/factories/todo_lists.rb
 - spec/dummy/spec/factories/todos.rb
-- spec/dummy/spec/qunits/adding_todos/adding_todos_qlive.rb
+- spec/dummy/spec/qunits/adding_todos/long_list_qlive.rb
+- spec/dummy/spec/qunits/adding_todos/short_list_qlive.rb
 - spec/dummy/spec/qunits/adding_todos/test-ajax-creation.js
 - spec/dummy/spec/qunits/qunit_support/qunit-logger.js
 - spec/dummy/spec/qunits/qunit_support/qunit-starter.js
@@ -177,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Run qlive-rails qunit javascript tests headlessly alongside your normal rspec
@@ -243,7 +269,8 @@ test_files:
 - spec/dummy/script/test
 - spec/dummy/spec/factories/todo_lists.rb
 - spec/dummy/spec/factories/todos.rb
-- spec/dummy/spec/qunits/adding_todos/adding_todos_qlive.rb
+- spec/dummy/spec/qunits/adding_todos/long_list_qlive.rb
+- spec/dummy/spec/qunits/adding_todos/short_list_qlive.rb
 - spec/dummy/spec/qunits/adding_todos/test-ajax-creation.js
 - spec/dummy/spec/qunits/qunit_support/qunit-logger.js
 - spec/dummy/spec/qunits/qunit_support/qunit-starter.js

data/spec/dummy/spec/qunits/adding_todos/adding_todos_qlive.rb

@@ -1,13 +0,0 @@
-class AddingTodosQlive
-  include Qlive::Suite
-
-  def pages_to_test
-    [ '/#colors/blue', '/#colors/brown' ]
-  end
-
-  def before_each_request(rack_request)
-    Todo.destroy(Todo.all.map(&:id))
-    4.times { FactoryGirl.create(:todo) }
-  end
-
-end