minitest-capybara 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86376b532c4569b87464a8ceb3591ad7468d2216
-  data.tar.gz: e4f06509913e792d39154d661436d208cf6bddfe
+  metadata.gz: f3cad186559582c6b6c245b54214ee2bce8fe6be
+  data.tar.gz: 02bb027bc471f6c83f730f8f7211715788068081
 SHA512:
-  metadata.gz: 9950cb467f45b29d1d8a26a77ae2d7eb465036085712c1b77f6c9da2a63bea530dc6571bb74f46e4e3464a97d25fc517369f2c3d61e99fe04cec0ce570fc7bd7
-  data.tar.gz: cbc086315dc445afc1e8ba7929b7772c521de79cb17ee4f02c981ba9d43862031964b32424f05ac1bbcc4b545308a71fb64e56841137ab29ab12073b49a0202b
+  metadata.gz: e41c570259fe17200c68cd51fa2823d6f73699d98a5e9a45380338c3c1498fbf7b74fc07c5ddd52ed49123cc0457468182742b5d30481fc05733fd644f3a3508
+  data.tar.gz: 221eb2b615a90567e5ce4080daeaea6d393edc7a4f7a048589ace9aa1523fb1c0ab695fa3054dd17ad8577d1e29a2d2eb9f8661c0418d9b22b6fc1b243c4c819

data/.travis.yml

@@ -1,21 +1,21 @@
 language: ruby
 cache: bundler
 rvm:
-# - 1.9.3
-# - 2.0.0
-# - 2.1.0
-# - 2.1.1
-- 2.1.2
-# - jruby
-# - rbx-2
+- 2.1
+- 2.2
+- 2.3.0
+
+before_install:
+ - gem update bundler
+
 deploy:
   provider: rubygems
   api_key:
     secure: beHIrfhi+kpvA67zbiMXx5n2qAUaNUz+y3RO3yB19jIiTm4Zol8DRJH9jKO6YpIwLlolTrGVQsmZHqmmXRghv3qZXeYwLdp0mvyMIYc5w10OiRwDzlS1DFogevDszRDpypP7J48oFn2llRt1mw9HyLE83GFQcTEvxUJ+ENLA3tY=
   gem: minitest-capybara
   on:
-    repo: wojtekmach/minitest-capybara
-    condition: ./script/unreleased
+    tags: true
+
 before_deploy:
 - echo Deploying...
 

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## HEAD
+
+## v0.8.0
+
+* Remove depracation for Minitest::Capybara::Assertions.
+* Better error messages for `assert_content/refute_content`.
+* Remove feature DSL.
+* Add Minitest::Capybara::Test and Minitest::Capybara::Spec classes.
+
 ## v0.7.2
 
 * Update exception message to Capybara::Assertions. - @apotonick

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Wojciech Mach
+Copyright (c) 2013-2015 Wojciech Mach
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -23,90 +23,50 @@ With this project minitest gets all the good stuff.
 
 ## Rails integration
 
-Check out [minitest-rails-capybara](https://github.com/blowmage/minitest-rails-capybara)
+`minitest-capybara` (and `capybara`) works with Rails out of the box, remember to require `capybara/rails`.
 
-## Usage
-
-See example app: https://github.com/wojtekmach/minitest-capybara-example
-
-Add to Gemfile:
-
-```ruby
-# Gemfile
-group :test do
-  gem "minitest-capybara"
-end
-```
-
-```ruby
-# features/my_feature.rb
-require 'test_helper'
+See example Rails app: <https://github.com/wojtekmach/minitest-capybara-example>.
 
-feature "My Super Feature" do
-  given(:lion) { ... }
+For more features check out: [minitest-rails-capybara](https://github.com/blowmage/minitest-rails-capybara).
 
-  background do
-    visit "/feature"
-  end
-
-  scenario "this awesome feature" do
-    page.must_have_content("Awesome Feature")
-  end
-end
-```
+## Usage
 
-Or if you prefer to create seperate test class for acceptance tests.
+With minitest/test:
 
 ```ruby
-# test/test_helper.rb
-require "capybara/rails"
+class HomeTest < Minitest::Capybara::Test
+  def test_home
+    visit "/"
 
-# for just minitest/unit
-class AcceptanceTest < Minitest::Test
-  include Capybara::DSL
-  include Capybara::Assertions
+    assert_content "Homepage"
 
-  def teardown
-    Capybara.reset_session!
-    Capybara.use_default_driver
-  end
-end
+    within ".login" do
+      refute_content "Signed in as"
+    end
 
-# for minitest/spec
-class AcceptanceSpec < Minitest::Spec
-  include Capybara::DSL
-  include Capybara::Assertions
+    assert_link "Sign in"
+    assert_link find(".login"), "Sign in"
 
-  def teardown
-    Capybara.reset_session!
-    Capybara.use_default_driver
+    assert_selector 'li:first', text: "Item 1"
   end
 end
 ```
 
-and you can use it like this:
+With minitest/spec:
 
 ```ruby
-# test/acceptance/home_test.rb
-require "test_helper"
-
-class HomeTest < AcceptanceSpec
-  it "home test" do
+class HomeSpec < Minitest::Capybara::Spec
+  it "works" do
     visit "/"
 
-    assert_content "Homepage"
     page.must_have_content "Homepage"
 
     within ".login" do
-      refute_content "Signed in as"
       page.wont_have_content "Signed in as"
     end
 
-    assert_link "Sign in"
-    assert_link find(".login"), "Sign in"
     find(".login").must_have_link("Sign in")
 
-    assert_selector 'li:first', text: "Item 1"
     page.must_have_selector 'li:first', text: "Item 1"
   end
 end
@@ -121,7 +81,7 @@ Switching drivers is easy with [minitest-metadata]:
 ```ruby
 require 'minitest-metadata'
 
-class AcceptanceSpec
+class AcceptanceSpec < Minitest::Capybara::Spec
   before do
     if metadata[:js]
       Capybara.current_driver = Capybara.javascript_driver
@@ -131,7 +91,7 @@ class AcceptanceSpec
   end
 end
 
-class HomeTest < AcceptanceSpec
+class HomeSpec < AcceptanceSpec
   it "home with ajax", js: true do
     visit "/"
     page.must_have_content "AJAX enabled..."
@@ -141,25 +101,4 @@ end
 
 ## License
 
-(The MIT License)
-
-Copyright (c) Wojciech Mach
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+minitest-capybara is released under the [MIT License](LICENSE.txt).

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/lib/capybara/assertions.rb

@@ -6,13 +6,13 @@ module Capybara
 
     def assert_text(*args)
       node, *args = prepare_args(args)
-      assert node.has_text?(*args), message { "Expected to include #{args.first.inspect}" }
+      assert node.has_text?(*args), message { "Expected to find text #{args.first.inspect} in #{node.text.inspect}" }
     end
     alias_method :assert_content, :assert_text
 
     def refute_text(*args)
       node, *args = prepare_args(args)
-      assert node.has_no_text?(*args), message { "Expected not to include #{args.first.inspect}" }
+      assert node.has_no_text?(*args), message { "Expected not to find text #{args.first.inspect} in #{node.text.inspect}" }
     end
     alias_method :assert_no_text, :refute_text
     alias_method :refute_content, :refute_text

data/lib/minitest/capybara.rb

@@ -1,5 +1,5 @@
-require "minitest/capybara/version"
 require "capybara"
+require "minitest/capybara/version"
 
 module Minitest
   module Capybara
@@ -22,15 +22,25 @@ end
 require "capybara/assertions"
 require "capybara/expectations"
 
-# :stopdoc:
 module Minitest
   module Capybara
-    def self.const_missing const
-      if :Assertions == const
-        warn "Minitest::Capybara::Assertions is deprecated. Please use Capybara::Assertions instead."
-        ::Capybara::Assertions
-      else
-        super const
+    class Test < Minitest::Test
+      include ::Capybara::DSL
+      include ::Capybara::Assertions
+
+      def teardown
+        ::Capybara.reset_session!
+        ::Capybara.use_default_driver
+      end
+    end
+
+    class Spec < Minitest::Spec
+      include ::Capybara::DSL
+      include ::Capybara::Assertions
+
+      def teardown
+        ::Capybara.reset_session!
+        ::Capybara.use_default_driver
       end
     end
   end

data/test/capybara/assertions_test.rb

@@ -1,24 +1,27 @@
-require 'test_helper'
-
-Capybara.app = lambda { |env| [200, {}, "<div><h1>foo</h1><a href='/'>bar</a></div>"] }
+require "test_helper"
 
 describe "Assertions" do
   include Capybara::DSL
   include Capybara::Assertions
 
-  before do
-    visit "/"
-  end
-
   it "defines all the assertions that Capybara does" do
-    assert_(:assertions)
+    Minitest::Capybara.assertions.each do |assertion|
+      assert self.respond_to?("assert_#{assertion}"),
+             "The assertion assert_#{assertion} is not defined."
+    end
   end
 
   it "defines all the refutations that Capybara does" do
-   refute_(:refutations)
+    Minitest::Capybara.refutations.each do |refutation|
+      assert self.respond_to?("refute_#{refutation}"),
+             "The assertion refute_#{refutation} is not defined."
+    end
   end
 
   it "defines all the negative assertions that Capybara does" do
-   assert_no_(:refutations)
+    Minitest::Capybara.refutations.each do |refutation|
+      assert self.respond_to?("assert_no_#{refutation}"),
+             "The assertion assert_no_#{refutation} is not defined."
+    end
   end
 end

data/test/capybara/expectations_test.rb

@@ -1,20 +1,20 @@
-require 'test_helper'
-
-Capybara.app = lambda { |env| [200, {}, "<div><h1>foo</h1><a href='/'>bar</a></div>"] }
+require "test_helper"
 
 describe "Expectations" do
   include Capybara::DSL
   include Capybara::Assertions
 
-  before do
-    visit "/"
-  end
-
   it "defines all the must expectations that Capybara does" do
-    must_have_(:assertions)
+    Minitest::Capybara.assertions.each do |assertion|
+      assert page.respond_to?("must_have_#{assertion}"),
+             "The expectation must_have_#{assertion} is not defined."
+    end
   end
 
   it "defines all the wont expectations that Capybara does" do
-    wont_have_(:refutations)
+    Minitest::Capybara.refutations.each do |refutation|
+      assert page.respond_to?("wont_have_#{refutation}"),
+             "The expectation wont_have_#{refutation} is not defined."
+    end
   end
 end

data/test/minitest/capybara_test.rb

@@ -2,10 +2,7 @@ require 'test_helper'
 
 Capybara.app = lambda { |env| [200, {}, "<div><h1>foo</h1><a href='/'>bar</a></div>"] }
 
-describe "app" do
-  include Capybara::DSL
-  include Capybara::Assertions
-
+class AppTest < Minitest::Capybara::Spec
   before do
     visit "/"
   end
@@ -14,12 +11,14 @@ describe "app" do
 
   it "supports assert_content" do
     assert_content("foo").must_equal true
-    proc { assert_content("BAD") }.must_raise Minitest::Assertion
+    e = proc { assert_content("BAD") }.must_raise Minitest::Assertion
+    e.message.must_equal "Expected to find text \"BAD\" in \"foobar\"."
   end
 
   it "supports refute_content" do
     refute_content("BAD").must_equal true
-    proc { refute_content("foo") }.must_raise Minitest::Assertion
+    e = proc { refute_content("foo") }.must_raise Minitest::Assertion
+    e.message.must_equal "Expected not to find text \"foo\" in \"foobar\"."
   end
 
   it "supports assert_selector" do

data/test/test_helper.rb

@@ -1,4 +1,2 @@
 require "minitest/autorun"
-require "support/helper"
 require "minitest/capybara"
-require "minitest/features"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-capybara
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Wojciech Mach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -72,19 +72,11 @@ files:
 - lib/minitest-capybara.rb
 - lib/minitest/capybara.rb
 - lib/minitest/capybara/version.rb
-- lib/minitest/features.rb
-- lib/minitest/features/acceptance_spec.rb
-- lib/minitest/features/dsl.rb
 - minitest-capybara.gemspec
-- script/unreleased
 - test/capybara/assertions_test.rb
-- test/capybara/assertions_using_features_spec.rb
 - test/capybara/expectations_test.rb
-- test/capybara/expectations_using_features_spec.rb
 - test/minitest/base_node_test.rb
 - test/minitest/capybara_test.rb
-- test/minitest/features_test.rb
-- test/support/helper.rb
 - test/test_helper.rb
 homepage: ''
 licenses: []
@@ -111,11 +103,7 @@ specification_version: 4
 summary: Capybara matchers support for minitest unit and spec
 test_files:
 - test/capybara/assertions_test.rb
-- test/capybara/assertions_using_features_spec.rb
 - test/capybara/expectations_test.rb
-- test/capybara/expectations_using_features_spec.rb
 - test/minitest/base_node_test.rb
 - test/minitest/capybara_test.rb
-- test/minitest/features_test.rb
-- test/support/helper.rb
 - test/test_helper.rb

data/lib/minitest/features.rb

@@ -1,2 +0,0 @@
-require 'minitest/features/acceptance_spec'
-require 'minitest/features/dsl'

data/lib/minitest/features/acceptance_spec.rb

@@ -1,6 +0,0 @@
-module Minitest
-  module AcceptanceSpec
-    include ::Capybara::DSL
-    include ::Capybara::Assertions
-  end
-end

data/lib/minitest/features/dsl.rb

@@ -1,28 +0,0 @@
-module Minitest
-  module Features
-    module DSL
-
-      include AcceptanceSpec
-
-      ##
-      # describe is 'defined' in Object
-      # therefore it is available anywhere
-      # so that allows us to simply
-      # alias feature to describe.
-      alias :feature :describe
-
-    end
-  end
-
-  module Spec::DSL
-    ##
-    # Pure simple old Ruby#Module alias method
-    #
-    alias :scenario :it
-    alias :background :before
-    alias :given :let
-  end
-
-end
-
-Object.send(:include, Minitest::Features::DSL)

data/script/unreleased

@@ -1,6 +0,0 @@
-#!/bin/sh
-# Exits with 0 if current gem is not yet released, 1 otherwise.
-
-if git tag | grep --silent `cat VERSION`; then
-    exit 1
-fi

data/test/capybara/assertions_using_features_spec.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-app = lambda { |env|
-  [200, { "X-Content-Type" => "Capybara" },"<div><h1>foo</h1><a href='/'>bar</a></div>"]
-}
-
-Capybara.app = app
-
-feature "Assertions" do
-
-  background do
-    visit "/"
-  end
-
-  scenario "defines all assertions capybara does" do
-    assert_(:assertions)
-  end
-
-  scenario "defines all refutations that Capybara does" do
-    refute_(:refutations)
-  end
-
-  scenario "defines all negative assertions that Capybara does" do
-    assert_no_(:refutations)
-  end
-
-end

data/test/capybara/expectations_using_features_spec.rb

@@ -1,24 +0,0 @@
-require 'test_helper'
-
-Capybara.app = lambda { |env| [200, {}, "<div><h1>foo</h1><a href='/'>bar</a></div>"] }
-
-feature "Expectations" do
-
-  given(:bob) { "Hi 'am bob" }
-  background do
-    visit "/"
-  end
-
-  scenario "defines all the must expectations that Capybara does" do
-    must_have_(:assertions)
-  end
-
-  scenario "defines all the wont expectations that Capybara does" do
-    wont_have_(:refutations)
-  end
-
-  scenario "bob" do
-    bob.must_be_kind_of String
-  end
-
-end

data/test/minitest/features_test.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-feature "Testing Features" do
-
-  scenario "I am a scenario" do
-    :it_works.must_equal :it_works
-  end
-
-  scenario "it must include AcceptanceSpec" do
-    self.class.must_include Minitest::AcceptanceSpec
-  end
-
-  feature "must work if nested" do
-    scenario "it works" do
-      :it_works.must_equal :it_works
-    end
-  end
-
-end
-
-feature "Testing methods" do
-
-  given(:bob) { self.class }
-
-  scenario { bob.must_respond_to :background }
-
-end

data/test/support/helper.rb

@@ -1,56 +0,0 @@
-module Helper
-
-  def capybara(m)
-    Minitest::Capybara.send(m)
-  end
-
-  def notice(msg)
-    "The #{msg} is not defined."
-  end
-
-  ##
-  # method_name matches anything apart from have
-  # it must be an assertion
-  # if it matches it must be an expectation
-  #
-  def or_message(method_name, msg)
-    if method_name =! Regexp.new("have")
-      notice("assertions " + msg)
-    else
-      notice("expectation "+ msg)
-    end
-  end
-
-  ##
-  # Ask either self or page
-  #
-  def respond_to(m)
-    self.respond_to?(m) || page.respond_to?(m)
-  end
-
-  ##
-  # callee here works but __method__ would not.
-  # that's because callee changes accordingly as
-  # self changes.
-  # id2name simply converts a symbol to a string.
-  # _method_ creates a method to be looked up
-  # _method_ = "refute_method_name"
-  #
-  def assert_(method_name)
-    callee = send(:__callee__).id2name
-    capybara(method_name).each do |assertion|
-      _method_ = "#{callee}#{assertion}"
-
-      assert respond_to(_method_),
-        or_message(callee, _method_)
-    end
-  end
-
-  alias :refute_    :assert_
-  alias :assert_no_ :assert_
-  alias :must_have_ :assert_
-  alias :wont_have_ :assert_
-
-end
-
-Object.send(:include, Helper)