transactional_capybara 0.1.0.pre.2 → 0.1.0.pre.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1734358fb0654defcb9c353940bf2e34ab7da006
+  data.tar.gz: caa82834cde32a345c9fd643b037d30e26d333f9
+SHA512:
+  metadata.gz: 20c099399240513932b8814c8d5f18a40c77c59066768329014e4bef6592daeed2381c8f38a14832e109df98588b490017d372748d605b7890ced743578f02cf
+  data.tar.gz: 6a21b2f64c446f345ba7d2ecc5a43ed2ca1232c373c5a35ab45cc078e9e988af29a5637a28353c6a360a0560924d77cd32e7d32523468b39ccaccf573ba11fa1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/config.yml

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0"
+  - "2.1"
+  - "2.2"
+before_install:
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
+  - "export DISPLAY=:99.0"
+before_script:
+  - mysql -e "create database IF NOT EXISTS transactional_capybara_test;" -uroot
+  - psql -c 'create database transactional_capybara_test;' -U postgres
+  - "cp spec/{.travis.,}config.yml"
+script: bundle exec rake test:all
+sudo: false

data/README.md

@@ -110,3 +110,12 @@ I'd love a pull request, or even just a friendly inquiry!
 4. Push to the branch (`git push origin my-new-feature`)
 5. Think about how I'm a bad person for not writing any tests yet
 6. Create new Pull Request
+
+### Running the tests ###
+
+```
+cp spec/support/config.yml{.example,} # Edit as necessary
+DB=sqlite rspec spec
+```
+
+You can run the specs with other databases as well, but you will have to create the databases and users manually first.

data/Rakefile

@@ -1 +1,22 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+require 'yaml'
+require 'active_support'
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:rspec)
+
+  desc "Run tests against all drivers and all databases listed in the config"
+  task :all do
+    db_config = YAML.load_file(File.join(File.dirname(__FILE__), "spec/config.yml"))
+    db_config["database"].keys.each do |db_name|
+      ENV['DB'] = db_name
+      %w[selenium webkit].each do |driver|
+        ENV['DRIVER'] = driver
+        puts ENV.to_hash.slice 'DRIVER', 'DB'
+        Rake::Task['test:rspec'].reenable
+        Rake::Task['test:rspec'].invoke
+      end
+    end
+  end
+end

data/lib/transactional_capybara/ajax_helpers.rb

@@ -26,12 +26,15 @@ module TransactionalCapybara
         ).zero?
       end
 
+      # TODO: timeout each individual session
       def wait_until(timeout=Capybara.default_wait_time)
         Timeout.timeout(timeout) do
           until yield
             sleep(0.01)
           end
         end
+      rescue Timeout::Error
+        # Oh well, hopefully it finished!
       end
 
       private
@@ -47,7 +50,7 @@ module TransactionalCapybara
       end
 
       def run_js(expr)
-        @page.execute_script(expr)
+        @page.evaluate_script(expr)
       end
 
       def angular?

data/lib/transactional_capybara/rspec.rb

@@ -1,3 +1,5 @@
+require 'transactional_capybara'
+
 RSpec.configure do |config|
   TransactionalCapybara.share_connection
   config.after(:each, js: true) do

data/lib/transactional_capybara/version.rb

@@ -1,3 +1,3 @@
 module TransactionalCapybara
-  VERSION = "0.1.0.pre.2"
+  VERSION = "0.1.0.pre.3"
 end

data/spec/.travis.config.yml

@@ -0,0 +1,14 @@
+---
+database:
+  mysql:
+    adapter: mysql2
+    host: localhost
+    username: travis
+    database: transactional_capybara_test
+  sqlite:
+    adapter: sqlite3
+    database: ":memory:"
+  postgres:
+    adapter: postgresql
+    username: postgres
+    database: transactional_capybara_test

data/spec/ajax_spec.rb

@@ -0,0 +1,74 @@
+require_relative 'support/server'
+require_relative 'support/model'
+
+RSpec.describe "server with AJAX", type: :feature, js: true do
+  before do
+    Capybara.app = AjaxServer
+    AjaxServer.should_return_from_ajax = false
+    @expected_message = "foobar"
+    TestValue.create! content: @expected_message
+  end
+
+  it "waits for AJAX" do
+    visit "/page_with_ajax"
+    expect(page).to have_content("Hello")
+    Thread.fork do
+      sleep 0.5
+      AjaxServer.should_return_from_ajax = true
+    end
+    expect(find(".message").text).not_to eq(@expected_message)
+    TransactionalCapybara::AjaxHelpers.wait_for_ajax(page)
+    expect(find(".message").text).to eq(@expected_message)
+  end
+
+  context "after hook", check_result_after: true do
+    it "automatically waits for AJAX" do
+      visit "/page_with_ajax"
+      expect(page).to have_content("Hello")
+      Thread.fork do
+        sleep 0.5
+        AjaxServer.should_return_from_ajax = true
+      end
+      expect(find(".message").text).not_to eq(@expected_message)
+    end
+  end
+
+  it "waits on all sessions" do
+    using_session :foo do
+      visit "/page_with_ajax"
+      expect(page).to have_content("Hello")
+    end
+
+    using_session :bar do
+      visit "/boring_page"
+      expect(page).to have_content("Hi")
+    end
+
+    Thread.fork do
+      sleep 0.5
+      AjaxServer.should_return_from_ajax = true
+    end
+    TransactionalCapybara::AjaxHelpers.wait_for_ajax(page)
+
+    using_session :foo do
+      expect(find(".message").text).to eq(@expected_message)
+    end
+
+    AjaxServer.should_return_from_ajax = false
+
+    using_session :bar do
+      visit "/page_with_ajax"
+      expect(page).to have_content("Hello")
+    end
+
+    Thread.fork do
+      sleep 0.5
+      AjaxServer.should_return_from_ajax = true
+    end
+    TransactionalCapybara::AjaxHelpers.wait_for_ajax(page)
+
+    using_session :bar do
+      expect(find(".message").text).to eq(@expected_message)
+    end
+  end
+end

data/spec/config.yml.example

@@ -0,0 +1,18 @@
+---
+database:
+  mysql:
+    adapter: mysql2
+    host: localhost
+    username: transactional_capybara
+    password: abcd1234
+    database: transactional_capybara
+  sqlite:
+    adapter: sqlite3
+    host: localhost
+    database: tmp/test.db
+  postgres:
+    adapter: postgresql
+    host: localhost
+    username: transactional_capybara
+    password: abcd1234
+    database: transactional_capybara

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+require 'yaml'
+db_type = ENV['DB'] || 'sqlite'
+db_config = YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+db = db_config["database"][db_type]
+
+require 'active_record'
+ActiveRecord::Base.establish_connection(db)
+load File.join(File.dirname(__FILE__), "support/schema.rb")
+
+require 'capybara/rspec'
+require 'capybara-webkit'
+
+capybara_driver = ENV['DRIVER'] || 'selenium'
+Capybara.javascript_driver = capybara_driver.to_sym
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.after(:each, check_result_after: true) do
+    expect(find(".message").text).to eq(@expected_message)
+  end
+end
+
+require 'transactional_capybara/rspec'

data/spec/support/migration.rb

@@ -0,0 +1,3 @@
+ActiveRecord::Migration.create_table :test_values do |t|
+  t.string :content
+end

data/spec/support/model.rb

@@ -0,0 +1,2 @@
+class TestValue < ActiveRecord::Base
+end

data/spec/support/schema.rb

@@ -0,0 +1,5 @@
+ActiveRecord::Schema.define do
+  create_table :test_values, :force => true do |t|
+    t.string  :content
+  end
+end

data/spec/support/server.rb

@@ -0,0 +1,22 @@
+require 'sinatra'
+require 'tilt/erb'
+require_relative 'model'
+
+class AjaxServer < Sinatra::Base
+  cattr_accessor :should_return_from_ajax
+
+  get "/boring_page" do
+    erb "Hi", layout: :basic
+  end
+
+  get "/page_with_ajax" do
+    erb :page_with_ajax, layout: :basic
+  end
+
+  get "/ajax_endpoint" do
+    until AjaxServer.should_return_from_ajax do
+      sleep 0.01
+    end
+    TestValue.last.content
+  end
+end

data/spec/support/views/basic.erb

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title></title>
+    </head>
+    <body>
+      <%= yield %>
+    </body>
+</html>

data/spec/support/views/page_with_ajax.erb

@@ -0,0 +1,14 @@
+<p class="message">Nothing to see</p>
+
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.js"></script>
+<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.11.2.js"><\/script>')</script>
+<script>
+jQuery(function() {
+  jQuery.ajax('/ajax_endpoint', {
+    success: function(data) {
+      jQuery(".message").text(data);
+    }
+  });
+  jQuery(".message").text("Hello!");
+});
+</script>

data/transactional_capybara.gemspec

@@ -18,6 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "capybara"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "sinatra"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "selenium-webdriver"
+  spec.add_development_dependency "capybara-webkit"
 end

metadata

@@ -1,46 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: transactional_capybara
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.2
-  prerelease: 6
+  version: 0.1.0.pre.3
 platform: ruby
 authors:
 - Ian Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Support for DB transactions with Capybara
@@ -50,7 +171,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -60,33 +184,51 @@ files:
 - lib/transactional_capybara/rspec.rb
 - lib/transactional_capybara/shared_connection.rb
 - lib/transactional_capybara/version.rb
+- spec/.travis.config.yml
+- spec/ajax_spec.rb
+- spec/config.yml.example
+- spec/spec_helper.rb
+- spec/support/migration.rb
+- spec/support/model.rb
+- spec/support/schema.rb
+- spec/support/server.rb
+- spec/support/views/basic.erb
+- spec/support/views/page_with_ajax.erb
 - transactional_capybara.gemspec
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Speed up your test suite with database transactions, without losing your
   mind to Capybara connection problems. Supports shared connections, plus AJAX watchers
   to avoid common deadlock scenarios.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/.travis.config.yml
+- spec/ajax_spec.rb
+- spec/config.yml.example
+- spec/spec_helper.rb
+- spec/support/migration.rb
+- spec/support/model.rb
+- spec/support/schema.rb
+- spec/support/server.rb
+- spec/support/views/basic.erb
+- spec/support/views/page_with_ajax.erb