daddy 0.3.36 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c428afd1f9735c149dee419744e8146fd21ef7
-  data.tar.gz: a3605267f0f3057728251b1aca893b82d0106898
+  metadata.gz: 9c0bb2d8aba8973fe59bacc0dcd1daa81e214fbc
+  data.tar.gz: e2f9ed6a88ddba78f8e20b8481c109e268714988
 SHA512:
-  metadata.gz: 355fbdd82374eae1acc94210c6e448ff7312b3a9311c45de3d50aedb2c1dbe6b56ffb21476a676d7c627d9f94f77bef74ff69d25f5fa00abe0f846bf4282873d
-  data.tar.gz: 2f5a8fd9465c919290c2b79ffbea4f06494438fe588f5d9fe1f013ff2266902cb05f76aecf270bf90b80a56b2b190538da2161489696d58439a5549e9f035b63
+  metadata.gz: 15e4c7f8f5c0a29f1788efbb8a72df9e23a49f72fd74b411e9225703e2a22c4d34faf4d9503696d95a3b034ed03617c4163d8c8ada9726daf940149e86209bcf
+  data.tar.gz: 44925a6c65323dc6bf593728abbc905fea724d7cfc384a930d05d27242d5060986a713e10274db626cc721bf645dd657ca7c8ab42210ff8b0ddf6306c4699e9f

data/lib/daddy/cucumber.rb

@@ -1,10 +1,3 @@
-require 'daddy'
-
-if defined?(Rails)
-  require 'capybara/rails'
-  ActionController::Base.allow_rescue = false
-end
-
 require 'daddy/git'
 require 'differ'
 require_relative 'differ/html_patch.rb'

data/lib/daddy/cucumber/helpers.rb

@@ -1,3 +1,16 @@
+require 'closer/helpers'
+
+if defined?(Rails)
+  env_caller = File.dirname(caller.detect{ |f| f =~ /\/env\.rb:/ }) if caller.detect{ |f| f =~ /\/env\.rb:/ }
+  ENV['RAILS_ENV'] ||= 'test'
+  ENV['RAILS_ROOT'] ||= File.expand_path(env_caller + '/../..')
+  require File.expand_path(ENV['RAILS_ROOT'] + '/config/environment')
+  require 'rails/test_help'
+  MultiTest.disable_autorun
+
+  require 'capybara/rails'
+end
+
 Dir::glob(File.dirname(__FILE__) + '/helpers/*.rb').each do |file|
   require file
 end

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.36'
+  VERSION = '0.3.37'
 end

data/lib/tasks/test.rake

@@ -4,7 +4,6 @@ namespace :dad do
   
   desc 'Cucumberを使用してテストを実行します。'
   task :test => :environment do
-    ENV['FORMAT'] ||= 'Daddy::Formatter::Html'
     Rake::Task['close'].invoke
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.36
+  version: 0.3.37
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,28 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +266,6 @@ files:
 - lib/daddy/cucumber.rb
 - lib/daddy/cucumber/helpers.rb
 - lib/daddy/cucumber/helpers/assert.rb
-- lib/daddy/cucumber/helpers/capture.rb
 - lib/daddy/cucumber/helpers/diff.rb
 - lib/daddy/cucumber/helpers/html.rb
 - lib/daddy/cucumber/helpers/pause.rb
@@ -292,14 +277,6 @@ files:
 - lib/daddy/cucumber/step_definitions/fill_in.rb
 - lib/daddy/cucumber/step_definitions/select.rb
 - lib/daddy/differ/html_patch.rb
-- lib/daddy/formatter/cucumber.css
-- lib/daddy/formatter/daddy.css
-- lib/daddy/formatter/daddy.js
-- lib/daddy/formatter/daddy_html.rb
-- lib/daddy/formatter/html.rb
-- lib/daddy/formatter/jquery-min.js
-- lib/daddy/formatter/menu.html.erb
-- lib/daddy/formatter/screenshot.js
 - lib/daddy/git.rb
 - lib/daddy/helpers/html_helper.rb
 - lib/daddy/http_client.rb

data/lib/daddy/cucumber/helpers/capture.rb

@@ -1,67 +0,0 @@
-module Daddy
-  module Cucumber
-    module Capture
-      feature_dir = 'features'
-      ARGV.each_with_index do |arg, i|
-        if arg == '-r'
-          feature_dir = ARGV[i + 1]
-          break
-        end
-      end
-      REPORT_DIR = File.join(feature_dir, 'reports')
-      IMAGE_DIR = 'images'
-      FileUtils.mkdir_p("#{REPORT_DIR}/#{IMAGE_DIR}")
-    
-      @@_screen_count = 0
-      @@_images = []
-    
-      def capture(options = {})
-        options ||= {}
-        options = {:title => options} if options.is_a?(String)
-
-        pause
-        return if ENV['FORMAT'] == 'junit'
-
-        url = Rack::Utils.unescape(current_url)
-    
-        @@_screen_count += 1
-
-        image = "#{IMAGE_DIR}/#{@@_screen_count}.png"
-        page.driver.save_screenshot("#{REPORT_DIR}/#{image}", :full => true)
-
-        image_tag = "<img class=\"screenshot\" src=\"#{image}\" title=\"#{options[:title]}\" alt=\"#{url}\"/>"
-
-        if options[:flash]
-          puts image_tag
-        else
-          @@_images << image_tag
-        end
-      end
-
-      def resize_window(width, height)
-        case Capybara.current_driver
-        when :poltergeist
-          Capybara.current_session.driver.resize(width, height)
-        when :selenium
-          Capybara.current_session.driver.browser.manage.window.resize_to(width, height)
-        when :webkit
-          # TODO
-        end
-      end
-
-      def flash_image_tags
-        if @@_images.size > 0
-          puts @@_images.join("\n")
-          @@_images.clear
-        end
-      end
-
-    end
-  end
-end
-
-World(Daddy::Cucumber::Capture)
-
-AfterStep do |step|
-  flash_image_tags
-end

data/lib/daddy/formatter/cucumber.css

@@ -1,285 +0,0 @@
-/* cucumber.css is generated from cucumber.sass */
-/* Regenerate with rake sass */
-body {
-  font-size: 0px;
-  color: white;
-  margin: 0px;
-  padding: 0px;
-}
-
-.cucumber, td, th {
-  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
-  background: white;
-  color: black;
-}
-.cucumber #cucumber-header, td #cucumber-header, th #cucumber-header {
-  background: #65c400;
-  color: white;
-  height: 6em;
-}
-.cucumber #cucumber-header #expand-collapse p, td #cucumber-header #expand-collapse p, th #cucumber-header #expand-collapse p {
-  float: right;
-  margin: 0 0 0 10px;
-}
-.cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {
-  font-size: 11px;
-  padding: 3px;
-  margin: 0;
-  background: #65c400;
-  color: white;
-  font-weight: bold;
-}
-
-.background h3 {
-  font-size: 1.2em;
-  background: #666;
-}
-
-.cucumber h1, td h1, th h1 {
-  margin: 0px 10px 0px 10px;
-  padding: 10px;
-  font-family: "Lucida Grande", Helvetica, sans-serif;
-  font-size: 2em;
-  position: absolute;
-}
-.cucumber h4, td h4, th h4 {
-  margin-bottom: 2px;
-}
-.cucumber div.feature, td div.feature, th div.feature {
-  padding: 2px;
-  margin: 0px 10px 5px 10px;
-}
-.cucumber div.examples, td div.examples, th div.examples {
-  padding: 0em 0em 0em 1em;
-}
-.cucumber .stats, td .stats, th .stats {
-  margin: 2em;
-}
-.cucumber .summary ul.features li, td .summary ul.features li, th .summary ul.features li {
-  display: inline;
-}
-.cucumber .step_name, td .step_name, th .step_name {
-  float: left;
-}
-.cucumber .step_file, td .step_file, th .step_file {
-  text-align: right;
-  color: #999999;
-}
-.cucumber .step_file a, td .step_file a, th .step_file a {
-  color: #999999;
-}
-.cucumber .scenario_file, td .scenario_file, th .scenario_file {
-  float: right;
-  color: #999999;
-}
-.cucumber .tag, td .tag, th .tag {
-  font-weight: bold;
-  color: #246ac1;
-}
-.cucumber .backtrace, td .backtrace, th .backtrace {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: 1em;
-  color: black;
-}
-.cucumber a, td a, th a {
-  text-decoration: none;
-  color: #be5c00;
-}
-.cucumber a:hover, td a:hover, th a:hover {
-  text-decoration: underline;
-}
-.cucumber a:visited, td a:visited, th a:visited {
-  font-weight: normal;
-}
-.cucumber a div.examples, td a div.examples, th a div.examples {
-  margin: 5px 0px 5px 15px;
-  color: black;
-}
-.cucumber .outline table, td .outline table, th .outline table {
-  margin: 0px 0px 5px 10px;
-}
-.cucumber table, td table, th table {
-  border-collapse: collapse;
-}
-.cucumber table td, td table td, th table td {
-  padding: 3px 3px 3px 5px;
-}
-.cucumber table td.failed, .cucumber table td.passed, .cucumber table td.skipped, .cucumber table td.pending, .cucumber table td.undefined, td table td.failed, td table td.passed, td table td.skipped, td table td.pending, td table td.undefined, th table td.failed, th table td.passed, th table td.skipped, th table td.pending, th table td.undefined {
-  padding-left: 18px;
-  padding-right: 10px;
-}
-.cucumber table td.failed, td table td.failed, th table td.failed {
-  border-left: 5px solid #c20000;
-  border-bottom: 1px solid #c20000;
-  background: #fffbd3;
-  color: #c20000;
-}
-.cucumber table td.passed, td table td.passed, th table td.passed {
-  border-left: 5px solid #65c400;
-  border-bottom: 1px solid #65c400;
-  background: #dbffb4;
-  color: #3d7700;
-}
-.cucumber table td.skipped, td table td.skipped, th table td.skipped {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
-  color: #001111;
-}
-.cucumber table td.pending, td table td.pending, th table td.pending {
-  border-left: 5px solid #faf834;
-  border-bottom: 1px solid #faf834;
-  background: #fcfb98;
-  color: #131313;
-}
-.cucumber table td.undefined, td table td.undefined, th table td.undefined {
-  border-left: 5px solid #faf834;
-  border-bottom: 1px solid #faf834;
-  background: #fcfb98;
-  color: #131313;
-}
-.cucumber table td.message, td table td.message, th table td.message {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
-  color: #001111;
-}
-.cucumber ol, td ol, th ol {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-}
-.cucumber ol li.step, td ol li.step, th ol li.step {
-  padding: 3px 3px 3px 18px;
-  margin: 5px 0px 5px 5px;
-}
-.cucumber ol li, td ol li, th ol li {
-  margin: 0em 0em 0em 1em;
-  padding: 0em 0em 0em 0.2em;
-}
-.cucumber ol li span.param, td ol li span.param, th ol li span.param {
-  font-weight: bold;
-}
-.cucumber ol li.failed, td ol li.failed, th ol li.failed {
-  border-left: 5px solid #c20000;
-  border-bottom: 1px solid #c20000;
-  background: #fffbd3;
-  color: #c20000;
-}
-.cucumber ol li.passed, td ol li.passed, th ol li.passed {
-  border-left: 5px solid #65c400;
-  border-bottom: 1px solid #65c400;
-  background: #dbffb4;
-  color: #3d7700;
-}
-.cucumber ol li.skipped, td ol li.skipped, th ol li.skipped {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
-  color: #001111;
-}
-.cucumber ol li.pending, td ol li.pending, th ol li.pending {
-  border-left: 5px solid #faf834;
-  border-bottom: 1px solid #faf834;
-  background: #fcfb98;
-  color: #131313;
-}
-.cucumber ol li.undefined, td ol li.undefined, th ol li.undefined {
-  border-left: 5px solid #faf834;
-  border-bottom: 1px solid #faf834;
-  background: #fcfb98;
-  color: #131313;
-}
-.cucumber ol li.message, td ol li.message, th ol li.message {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
-  color: #001111;
-  margin-left: 10px;
-}
-.cucumber #summary, td #summary, th #summary {
-  margin: 0px;
-  padding: 5px 10px;
-  text-align: right;
-  top: 0px;
-  right: 0px;
-  float: right;
-}
-.cucumber #summary p, td #summary p, th #summary p {
-  margin: 0 0 0 2px;
-}
-.cucumber #summary #totals, td #summary #totals, th #summary #totals {
-  font-size: 1.2em;
-}
-
-.ruby {
-  font-size: 12px;
-  font-family: monospace;
-  color: white;
-  background: black;
-  padding: 0.1em 0 0.2em 0;
-}
-.ruby .keyword {
-  color: #ff6600;
-}
-.ruby .constant {
-  color: #339999;
-}
-.ruby .attribute {
-  color: white;
-}
-.ruby .global {
-  color: white;
-}
-.ruby .module {
-  color: white;
-}
-.ruby .class {
-  color: white;
-}
-.ruby .string {
-  color: #66ff00;
-}
-.ruby .ident {
-  color: white;
-}
-.ruby .method {
-  color: #ffcc00;
-}
-.ruby .number {
-  color: white;
-}
-.ruby .char {
-  color: white;
-}
-.ruby .comment {
-  color: #9933cc;
-}
-.ruby .symbol {
-  color: white;
-}
-.ruby .regex {
-  color: #44b4cc;
-}
-.ruby .punct {
-  color: white;
-}
-.ruby .escape {
-  color: white;
-}
-.ruby .interp {
-  color: white;
-}
-.ruby .expr {
-  color: white;
-}
-.ruby .offending {
-  background: #333333;
-}
-.ruby .linenum {
-  width: 75px;
-  padding: 0.1em 1em 0.2em 0;
-  color: black;
-  background: #fffbd3;
-}