daddy 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjljYjA5YjlmM2NiMWY0MmE1YjYxOWQ5MTU1OGE4MmM4ZjVkMzI5NA==
+    NGJmMjBjOWJjOGIyNzNkZDkyZWRlOTdhNGU5MWQ0YzQ4NzNiNzg2NQ==
   data.tar.gz: !binary |-
-    MTlkNmZiNDBjNjNmMDJmYjg5NDFmYTYxMTkzODRhMjhiMGE5MWY3Mg==
+    ZmE5ZjdmZmUwZWFmMzk0NDYyMjc1YTMyZjNkMzBiNjdhMDczNmU0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWE0YzE5OGY3ODYxYzZjMDgyNDE3ZDc1MGE2MGMyMDk5NTYwYTk5NTViYzk2
-    NjY3YTg1NjcwNmE4MmYxMGIxMDQxYThlY2U1MDhjOGRkMTgzZGQ5YmJjMjIy
-    YTdlZGRkMWVkOTBmZGVkMDUwNmVlMzJhMzJjMDQzYjMzYzA3OTI=
+    MWNmZTFjZmUwMDFiNGNmOTc1NmYwM2U2MTY1OTNlYjY3MDg0MmM3MmViNjNl
+    NWFlZWUxMzQ3ODE5MjA2YzRlMDQ0ZmE3ZWZiZGEyNWJhZGI0MTU4MGU4Mzdm
+    ZGIyZDVjODE4M2E2NjcxZTUxNWJmZWNjZmFjYjkyM2FmMWU0OWE=
   data.tar.gz: !binary |-
-    MTFlZDc4ZTJmMzljYjNiOTE5NjU1ZjJhOTQwNGY0YTI2Njc5YjZmOTcwMjBh
-    ZDVmYjZmOGI4MTIzNTU3MjY4YTIxMGZiZWRkZjllMjFmNzQ1NzljMTM3MDk1
-    MTdhMmUzM2U5ZThiNDkzOTJhOGI0Y2JhZmY4YTE4NzdkMWY0NDg=
+    ZjJlZDliOGFiZmIwZTkxMTkyZDM5MzQ5OGMwNjEwYTc1OTU2NDcxNTg0MTA0
+    ZGIzOThkZTA4ZGQ0ZGU3NTA3NjQ4ZmMwZjYyZjUwYmU3MGZmYmUzNTZlN2Nk
+    YTk2MGZiZDhlODc5YWYzOTlmZjg1NWJjMmQ2N2U4OGJlNmUxMTE=

data/lib/daddy/cucumber/assert.rb

@@ -39,11 +39,6 @@ module Daddy
         capture
       end
       
-      def assert_fill_in_rich(field_name, value)
-        fill_in_rich field_name, value
-        capture
-      end
-      
       def assert_check(field_name)
         check field_name
         capture
@@ -83,7 +78,7 @@ module Daddy
       end
       
       def assert_content_type(content_type)
-        assert_equal page.response_headers['Content-Type'], content_type
+        assert_equal content_type, page.response_headers['Content-Type']
       end
       
       def assert_iterate(array)

data/lib/daddy/cucumber/step_definitions/common.rb

@@ -8,10 +8,6 @@ end
   assert_check name
 end
 
-もし /^(.*?) に (.*?) を選択(する)?$/ do |name, value, suffix|
-  assert_select name, value
-end
-
 もし /^(.*?) に (.*?) を選ぶ?$/ do |name, value|
   assert_choose value
 end
@@ -19,15 +15,3 @@ end
 もし /^(.*?) を空白にする$/ do |name|
   assert_fill_in name, ''
 end
-
-もし /^(.*?) に (.*?) と入力(する)?$/ do |name, value, suffix|
-  assert_fill_in name, value
-end
-
-もし /^(.*?) に以下の文章を入力(する)?$/ do |name, suffix, text|
-  assert_fill_in name, text
-end
-
-もし /^(.*?) に (.*?) とリッチに入力(する)?$/ do |name, value, suffix|
-  assert_fill_in_rich name, value
-end

data/lib/daddy/cucumber/step_definitions/fill_in.rb

@@ -0,0 +1,25 @@
+# coding: UTF-8
+
+もし /^(.*?)に (.*?) と入力$/ do |name, value|
+  assert_fill_in name, value
+end
+
+もし /^(.*?) に (.*?) と入力$/ do |name, value|
+  assert_fill_in name, value
+end
+
+もし /^(.*?)に (.*?) と入力する$/ do |name, value|
+  assert_fill_in name, value
+end
+
+もし /^(.*?) に (.*?) と入力する$/ do |name, value|
+  assert_fill_in name, value
+end
+
+もし /^(.*?) に以下の文章を入力$/ do |name, text|
+  assert_fill_in name, text
+end
+
+もし /^(.*?) に以下の文章を入力する$/ do |name, text|
+  assert_fill_in name, text
+end

data/lib/daddy/cucumber/step_definitions/select.rb

@@ -0,0 +1,25 @@
+# coding: UTF-8
+
+もし /^(.*?)に(.*?)を選択$/ do |name, value|
+  assert_select name, value
+end
+
+もし /^(.*?)に (.*?) を選択$/ do |name, value|
+  assert_select name, value
+end
+
+もし /^(.*?) に (.*?) を選択$/ do |name, value|
+  assert_select name, value
+end
+
+もし /^(.*?)に(.*?)を選択する$/ do |name, value|
+  assert_select name, value
+end
+
+もし /^(.*?)に (.*?) を選択する$/ do |name, value|
+  assert_select name, value
+end
+
+もし /^(.*?) に (.*?) を選択する$/ do |name, value|
+  assert_select name, value
+end

data/lib/daddy/formatter/html.rb

@@ -249,7 +249,7 @@ module Daddy
       end
 
       def before_steps(steps)
-        @builder << '<ol>'
+        @builder << '<ol style="display: none;">'
       end
 
       def after_steps(steps)
@@ -604,11 +604,13 @@ module Daddy
     $("#collapser").css('cursor', 'pointer');
     $("#collapser").click(function() {
       $(SCENARIOS).siblings().hide();
+      $('li.message').hide();
     });
 
     $("#expander").css('cursor', 'pointer');
     $("#expander").click(function() {
       $(SCENARIOS).siblings().show();
+      $('li.message').show();
     });
   })
 
@@ -618,6 +620,10 @@ module Daddy
   function makeRed(element_id) {
     $('#'+element_id).css('background', '#C40D0D');
     $('#'+element_id).css('color', '#FFFFFF');
+
+    if (element_id.indexOf('scenario_' == 0)) {
+      $('#'+element_id).prev('.scenario_file').css('color', '#FFFFFF');
+    }
   }
   function makeMenuRed() {
     $('#menu .sprint').css('border-color', '#C40D0D');
@@ -625,6 +631,10 @@ module Daddy
   function makeYellow(element_id) {
     $('#'+element_id).css('background', '#FAF834');
     $('#'+element_id).css('color', '#000000');
+
+    if (element_id.indexOf('scenario_' == 0)) {
+      $('#'+element_id).prev('.scenario_file').css('color', '#000000');
+    }
   }
   function makeMenuYellow() {
     $('#menu .sprint').css('border-color', '#FAF834');

data/lib/daddy/rails/quiet_assets.rb

@@ -0,0 +1,13 @@
+if Rails.env.development?
+  Rails.application.assets.logger = Logger.new('/dev/null')
+  Rails::Rack::Logger.class_eval do
+    def call_with_quiet_assets(env)
+      previous_level = Rails.logger.level
+      Rails.logger.level = Logger::ERROR if env['PATH_INFO'] =~ %r{^/assets/}
+      call_without_quiet_assets(env)
+    ensure
+      Rails.logger.level = previous_level
+    end
+    alias_method_chain :call, :quiet_assets
+  end
+end

data/lib/daddy/railtie.rb

@@ -28,6 +28,10 @@ module Daddy
       end
     end
 
+    initializer 'quiet_assets' do
+      load File.join(File.dirname(__FILE__), 'rails', 'quiet_assets.rb')
+    end
+
     rake_tasks do
       lib = File.dirname(File.dirname(__FILE__))
       Dir[File.join(lib, 'tasks/*.rake')].each do |f|

data/lib/tasks/db_fixtures.rake

@@ -0,0 +1,19 @@
+# coding: UTF-8
+
+if defined?(RailsCsvFixtures)
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
+      task :load => [:environment, :load_config] do
+        require 'active_record/fixtures'
+  
+        base_dir     = File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten
+        fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact
+  
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.{yml,csv}"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file|
+          ActiveRecord::Fixtures.create_fixtures(fixtures_dir, fixture_file)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,20 +24,6 @@ dependencies:
     - - ! '>='
       - !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: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +192,34 @@ dependencies:
     - - ! '>='
       - !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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-csv-fixtures
+  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'
 description: Dadday helps me build rails applications since daddy knows some good
   practices.
 email: ichylinux@gmail.com
@@ -218,6 +232,8 @@ files:
 - lib/daddy/cucumber/pause.rb
 - lib/daddy/cucumber/capture.rb
 - lib/daddy/cucumber/html.rb
+- lib/daddy/cucumber/step_definitions/fill_in.rb
+- lib/daddy/cucumber/step_definitions/select.rb
 - lib/daddy/cucumber/step_definitions/click.rb
 - lib/daddy/cucumber/step_definitions/common.rb
 - lib/daddy/cucumber/assert.rb
@@ -226,6 +242,7 @@ files:
 - lib/daddy/helpers/html_helper.rb
 - lib/daddy/capistrano/remote_cache_subdir.rb
 - lib/daddy/git.rb
+- lib/daddy/rails/quiet_assets.rb
 - lib/daddy/model.rb
 - lib/daddy/formatter/menu.html.erb
 - lib/daddy/formatter/html.rb
@@ -246,6 +263,7 @@ files:
 - lib/tasks/db_config.rake
 - lib/tasks/publish.rake
 - lib/tasks/cucumber_steps.rake
+- lib/tasks/db_fixtures.rake
 - lib/tasks/cucumber.rake
 - lib/tasks/nginx.rake
 - lib/tasks/jenkins.conf