Permalink
Browse files

Revert "Ouch, should have dependencies rspec_hpricot_matchers - not r…

…spec_tag_matchers (yet)."

This reverts commit c307256.
  • Loading branch information...
1 parent 9bcb2dd commit 9061dc39906493cf494679581d349d11e7de5872 @justinfrench committed Nov 22, 2009
Showing with 10 additions and 32 deletions.
  1. +1 −2 Rakefile
  2. +4 −23 formtastic.gemspec
  3. +1 −1 spec/inputs/check_boxes_input_spec.rb
  4. +1 −1 spec/inputs/radio_input_spec.rb
  5. +3 −5 spec/spec_helper.rb
View
@@ -60,8 +60,7 @@ begin
# Development dependencies. Not installed by default.
# Install with: sudo gem install formtastic --development
s.add_development_dependency 'rspec-rails', '>= 1.2.6'
- s.add_development_dependency 'hpricot', '>= 0.6.1' # for: rspec_hpricot_matchers
- s.add_development_dependency 'rspec_hpricot_matchers', '>= 1.0.0'
+ s.add_development_dependency 'rspec_tag_matchers', '>= 1.0.0'
end
Jeweler::GemcutterTasks.new
View
@@ -1,6 +1,6 @@
# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Justin French"]
s.autorequire = %q{formtastic}
- s.date = %q{2009-11-22}
+ s.date = %q{2009-11-17}
s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
s.email = %q{justin@indent.com.au}
s.extra_rdoc_files = [
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
"generators/formtastic/templates/formtastic_changes.css",
"generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb",
"lib/formtastic.rb",
- "lib/formtastic/i18n.rb",
"lib/locale/en.yml",
"rails/init.rb",
"spec/buttons_spec.rb",
@@ -40,7 +39,6 @@ Gem::Specification.new do |s|
"spec/error_proc_spec.rb",
"spec/errors_spec.rb",
"spec/form_helper_spec.rb",
- "spec/i18n_spec.rb",
"spec/include_blank_spec.rb",
"spec/input_spec.rb",
"spec/inputs/boolean_input_spec.rb",
@@ -68,14 +66,11 @@ Gem::Specification.new do |s|
s.post_install_message = %q{
========================================================================
Thanks for installing Formtastic!
- ------------------------------------------------------------------------
+ ------------------------------------------------------------------------
You can now (optionally) run the generater to copy some stylesheets and
a config initializer into your application:
./script/generate formtastic
- To generate some semantic form markup for your exisiting models, just run:
- ./script/generate form MODEL_NAME
-
Find out more and get involved:
http://github.com/justinfrench/formtastic
http://groups.google.com.au/group/formtastic
@@ -93,7 +88,6 @@ Gem::Specification.new do |s|
"spec/error_proc_spec.rb",
"spec/errors_spec.rb",
"spec/form_helper_spec.rb",
- "spec/i18n_spec.rb",
"spec/include_blank_spec.rb",
"spec/input_spec.rb",
"spec/inputs/boolean_input_spec.rb",
@@ -122,21 +116,8 @@ Gem::Specification.new do |s|
s.specification_version = 3
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
- s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0"])
- s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
- s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
else
- s.add_dependency(%q<activesupport>, [">= 2.3.0"])
- s.add_dependency(%q<actionpack>, [">= 2.3.0"])
- s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
- s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
end
else
- s.add_dependency(%q<activesupport>, [">= 2.3.0"])
- s.add_dependency(%q<actionpack>, [">= 2.3.0"])
- s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
- s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
end
end
-
@@ -51,7 +51,7 @@
it 'should use values as li.class when value_as_class is true' do
::Post.find(:all).each do |post|
- output_buffer.should have_tag("form li fieldset ol li.v#{post.id} label")
+ output_buffer.should have_tag("form li fieldset ol li.#{post.id} label")
end
end
@@ -49,7 +49,7 @@
it 'should use values as li.class when value_as_class is true' do
::Author.find(:all).each do |author|
- output_buffer.should have_tag("form li fieldset ol li.v#{author.id} label")
+ output_buffer.should have_tag("form li fieldset ol li.#{author.id} label")
end
end
View
@@ -14,18 +14,16 @@ def smart_require(lib_name, gem_name, gem_version = '>= 0.0.0')
smart_require 'spec', 'spec', '>= 1.2.6'
smart_require false, 'rspec-rails', '>= 1.2.6'
-#smart_require 'hpricot', 'hpricot', '>= 0.6.1'
-#smart_require 'rspec_hpricot_matchers', 'rspec_hpricot_matchers', '>= 1.0.0'
-smart_require 'rspec_tag_matchers', 'rspec_tag_matchers', '>= 1.0.0'
+smart_require 'hpricot', 'hpricot', '>= 0.6.1'
+smart_require 'rspec_hpricot_matchers', 'rspec_hpricot_matchers', '>= 1.0.0'
smart_require 'active_support', 'activesupport', '>= 2.3.4'
smart_require 'action_controller', 'actionpack', '>= 2.3.4'
smart_require 'action_view', 'actionpack', '>= 2.3.4'
require 'custom_macros'
Spec::Runner.configure do |config|
- #config.include(RspecHpricotMatchers)
- config.include(RspecTagMatchers)
+ config.include(RspecHpricotMatchers)
config.include(CustomMacros)
end

0 comments on commit 9061dc3

Please sign in to comment.