Permalink
Browse files

Merge branch 'steak-2'

  • Loading branch information...
2 parents 5f7a4bd + 8dffe27 commit 8a93a15286c8f043cfead60fcce2ddfd75dc0860 @cavalle committed Jun 5, 2011
Showing with 2,789 additions and 1,446 deletions.
  1. +4 −4 .gitignore
  2. +10 −2 Gemfile
  3. +107 −88 Gemfile.lock
  4. +0 −27 History.md
  5. +1 −1 MIT-LICENSE → LICENSE
  6. +110 −0 README.md
  7. +0 −203 README.rdoc
  8. +5 −19 Rakefile
  9. +0 −1 generators/acceptance_spec/USAGE
  10. +0 −9 generators/acceptance_spec/acceptance_spec_generator.rb
  11. +0 −12 generators/acceptance_spec/templates/acceptance_spec.rb
  12. +0 −8 generators/steak/USAGE
  13. +0 −26 generators/steak/steak_generator.rb
  14. +0 −18 generators/steak/templates/acceptance_helper.rb
  15. +0 −5 generators/steak/templates/helpers.rb
  16. +0 −44 generators/steak/templates/steak.rake
  17. +12 −0 lib/generators/steak/install_generator.rb
  18. +11 −0 lib/generators/steak/spec_generator.rb
  19. +13 −0 lib/generators/steak/templates/acceptance_spec.rb
  20. +4 −0 lib/generators/steak/templates/spec/acceptance/acceptance_helper.rb
  21. 0 lib/generators/steak/templates/spec/acceptance/support/.gitignore
  22. +6 −0 lib/generators/steak/templates/spec/acceptance/support/helpers.rb
  23. +1 −1 ...rspec-2/rails/generators/templates → generators/steak/templates/spec/acceptance/support}/paths.rb
  24. +0 −17 lib/rspec-1/steak.rb
  25. +0 −31 lib/rspec-2/rails/generators/install_generator.rb
  26. +0 −36 lib/rspec-2/rails/generators/spec_generator.rb
  27. +0 −5 lib/rspec-2/rails/generators/templates/acceptance_helper.rb
  28. +0 −12 lib/rspec-2/rails/generators/templates/acceptance_spec.rb
  29. +0 −5 lib/rspec-2/rails/generators/templates/helpers.rb
  30. +0 −14 lib/rspec-2/rails/railtie.rb
  31. +0 −14 lib/rspec-2/rails/tasks/steak.rake
  32. +0 −31 lib/rspec-2/steak.rb
  33. +4 −10 lib/steak.rb
  34. +12 −0 lib/steak/acceptance_example_group.rb
  35. +7 −0 lib/steak/railtie.rb
  36. +3 −0 lib/steak/version.rb
  37. +14 −0 lib/tasks/steak_tasks.rake
  38. +75 −0 spec/acceptance/creating_specs_spec.rb
  39. +33 −0 spec/acceptance/getting_started_spec.rb
  40. +40 −0 spec/acceptance/rake_support_spec.rb
  41. +0 −98 spec/acceptance/rspec-1/acceptance_helper.rb
  42. +0 −44 spec/acceptance/rspec-1/acceptance_spec_generator_spec.rb
  43. +0 −76 spec/acceptance/rspec-1/basic_spec.rb
  44. +0 −39 spec/acceptance/rspec-1/rails_spec.rb
  45. +0 −96 spec/acceptance/rspec-1/steak_generator_spec.rb
  46. +0 −81 spec/acceptance/rspec-2/acceptance_helper.rb
  47. +0 −121 spec/acceptance/rspec-2/basic_spec.rb
  48. +0 −88 spec/acceptance/rspec-2/rails_spec.rb
  49. +0 −62 spec/acceptance/rspec-2/steak_install_generator_spec.rb
  50. +0 −77 spec/acceptance/rspec-2/steak_spec_generator_spec.rb
  51. +5 −0 spec/fixtures/rails_project/.gitignore
  52. +55 −0 spec/fixtures/rails_project/Gemfile
  53. +261 −0 spec/fixtures/rails_project/README
  54. +7 −0 spec/fixtures/rails_project/Rakefile
  55. BIN spec/fixtures/rails_project/app/assets/images/rails.png
  56. +9 −0 spec/fixtures/rails_project/app/assets/javascripts/application.js
  57. +7 −0 spec/fixtures/rails_project/app/assets/stylesheets/application.css
  58. +3 −0 spec/fixtures/rails_project/app/controllers/application_controller.rb
  59. +2 −0 spec/fixtures/rails_project/app/helpers/application_helper.rb
  60. 0 spec/fixtures/rails_project/app/mailers/.gitkeep
  61. 0 spec/fixtures/rails_project/app/models/.gitkeep
  62. +14 −0 spec/fixtures/rails_project/app/views/layouts/application.html.erb
  63. +4 −0 spec/fixtures/rails_project/config.ru
  64. +49 −0 spec/fixtures/rails_project/config/application.rb
  65. +6 −0 spec/fixtures/rails_project/config/boot.rb
  66. +48 −0 spec/fixtures/rails_project/config/database.yml
  67. +5 −0 spec/fixtures/rails_project/config/environment.rb
  68. +24 −0 spec/fixtures/rails_project/config/environments/development.rb
  69. +52 −0 spec/fixtures/rails_project/config/environments/production.rb
  70. +39 −0 spec/fixtures/rails_project/config/environments/test.rb
  71. +7 −0 spec/fixtures/rails_project/config/initializers/backtrace_silencers.rb
  72. +10 −0 spec/fixtures/rails_project/config/initializers/inflections.rb
  73. +5 −0 spec/fixtures/rails_project/config/initializers/mime_types.rb
  74. +7 −0 spec/fixtures/rails_project/config/initializers/secret_token.rb
  75. +8 −0 spec/fixtures/rails_project/config/initializers/session_store.rb
  76. +12 −0 spec/fixtures/rails_project/config/initializers/wrap_parameters.rb
  77. +5 −0 spec/fixtures/rails_project/config/locales/en.yml
  78. +58 −0 spec/fixtures/rails_project/config/routes.rb
  79. +7 −0 spec/fixtures/rails_project/db/seeds.rb
  80. +2 −0 spec/fixtures/rails_project/doc/README_FOR_APP
  81. 0 spec/fixtures/rails_project/lib/tasks/.gitkeep
  82. 0 spec/fixtures/rails_project/log/.gitkeep
  83. +26 −0 spec/fixtures/rails_project/public/404.html
  84. +26 −0 spec/fixtures/rails_project/public/422.html
  85. +26 −0 spec/fixtures/rails_project/public/500.html
  86. 0 spec/fixtures/rails_project/public/favicon.ico
  87. +241 −0 spec/fixtures/rails_project/public/index.html
  88. +5 −0 spec/fixtures/rails_project/public/robots.txt
  89. +6 −0 spec/fixtures/rails_project/script/rails
  90. 0 spec/fixtures/rails_project/test/fixtures/.gitkeep
  91. 0 spec/fixtures/rails_project/test/functional/.gitkeep
  92. 0 spec/fixtures/rails_project/test/integration/.gitkeep
  93. +12 −0 spec/fixtures/rails_project/test/performance/browsing_test.rb
  94. +13 −0 spec/fixtures/rails_project/test/test_helper.rb
  95. 0 spec/fixtures/rails_project/test/unit/.gitkeep
  96. 0 spec/fixtures/rails_project/vendor/assets/stylesheets/.gitkeep
  97. 0 spec/fixtures/rails_project/vendor/plugins/.gitkeep
  98. +5 −0 spec/fixtures/rails_project_with_steak/.gitignore
  99. +1 −0 spec/fixtures/rails_project_with_steak/.rspec
  100. +58 −0 spec/fixtures/rails_project_with_steak/Gemfile
  101. +261 −0 spec/fixtures/rails_project_with_steak/README
  102. +7 −0 spec/fixtures/rails_project_with_steak/Rakefile
  103. BIN spec/fixtures/rails_project_with_steak/app/assets/images/rails.png
  104. +9 −0 spec/fixtures/rails_project_with_steak/app/assets/javascripts/application.js
  105. +7 −0 spec/fixtures/rails_project_with_steak/app/assets/stylesheets/application.css
  106. +3 −0 spec/fixtures/rails_project_with_steak/app/controllers/application_controller.rb
  107. +2 −0 spec/fixtures/rails_project_with_steak/app/helpers/application_helper.rb
  108. 0 spec/fixtures/rails_project_with_steak/app/mailers/.gitkeep
  109. 0 spec/fixtures/rails_project_with_steak/app/models/.gitkeep
  110. +14 −0 spec/fixtures/rails_project_with_steak/app/views/layouts/application.html.erb
  111. +4 −0 spec/fixtures/rails_project_with_steak/config.ru
  112. +49 −0 spec/fixtures/rails_project_with_steak/config/application.rb
  113. +6 −0 spec/fixtures/rails_project_with_steak/config/boot.rb
  114. +48 −0 spec/fixtures/rails_project_with_steak/config/database.yml
  115. +5 −0 spec/fixtures/rails_project_with_steak/config/environment.rb
  116. +24 −0 spec/fixtures/rails_project_with_steak/config/environments/development.rb
  117. +52 −0 spec/fixtures/rails_project_with_steak/config/environments/production.rb
  118. +39 −0 spec/fixtures/rails_project_with_steak/config/environments/test.rb
  119. +7 −0 spec/fixtures/rails_project_with_steak/config/initializers/backtrace_silencers.rb
  120. +10 −0 spec/fixtures/rails_project_with_steak/config/initializers/inflections.rb
  121. +5 −0 spec/fixtures/rails_project_with_steak/config/initializers/mime_types.rb
  122. +7 −0 spec/fixtures/rails_project_with_steak/config/initializers/secret_token.rb
  123. +8 −0 spec/fixtures/rails_project_with_steak/config/initializers/session_store.rb
  124. +12 −0 spec/fixtures/rails_project_with_steak/config/initializers/wrap_parameters.rb
  125. +5 −0 spec/fixtures/rails_project_with_steak/config/locales/en.yml
  126. +58 −0 spec/fixtures/rails_project_with_steak/config/routes.rb
  127. +15 −0 spec/fixtures/rails_project_with_steak/db/schema.rb
  128. +7 −0 spec/fixtures/rails_project_with_steak/db/seeds.rb
  129. +2 −0 spec/fixtures/rails_project_with_steak/doc/README_FOR_APP
  130. 0 spec/fixtures/rails_project_with_steak/lib/tasks/.gitkeep
  131. 0 spec/fixtures/rails_project_with_steak/log/.gitkeep
  132. +26 −0 spec/fixtures/rails_project_with_steak/public/404.html
  133. +26 −0 spec/fixtures/rails_project_with_steak/public/422.html
  134. +26 −0 spec/fixtures/rails_project_with_steak/public/500.html
  135. 0 spec/fixtures/rails_project_with_steak/public/favicon.ico
  136. +241 −0 spec/fixtures/rails_project_with_steak/public/index.html
  137. +5 −0 spec/fixtures/rails_project_with_steak/public/robots.txt
  138. +6 −0 spec/fixtures/rails_project_with_steak/script/rails
  139. +4 −0 spec/fixtures/rails_project_with_steak/spec/acceptance/acceptance_helper.rb
  140. 0 spec/fixtures/rails_project_with_steak/spec/acceptance/support/.gitignore
  141. +6 −0 spec/fixtures/rails_project_with_steak/spec/acceptance/support/helpers.rb
  142. +1 −1 ...rators/steak/templates → spec/fixtures/rails_project_with_steak/spec/acceptance/support}/paths.rb
  143. +27 −0 spec/fixtures/rails_project_with_steak/spec/spec_helper.rb
  144. 0 spec/fixtures/rails_project_with_steak/test/fixtures/.gitkeep
  145. 0 spec/fixtures/rails_project_with_steak/test/functional/.gitkeep
  146. 0 spec/fixtures/rails_project_with_steak/test/integration/.gitkeep
  147. +12 −0 spec/fixtures/rails_project_with_steak/test/performance/browsing_test.rb
  148. +13 −0 spec/fixtures/rails_project_with_steak/test/test_helper.rb
  149. 0 spec/fixtures/rails_project_with_steak/test/unit/.gitkeep
  150. 0 spec/fixtures/rails_project_with_steak/vendor/assets/stylesheets/.gitkeep
  151. 0 spec/fixtures/rails_project_with_steak/vendor/plugins/.gitkeep
  152. +7 −0 spec/spec_helper.rb
  153. +73 −0 spec/support/helpers.rb
  154. +30 −0 spec/support/refresh_fixtures_task.rb
  155. +18 −20 steak.gemspec
View
@@ -1,5 +1,5 @@
+pkg/*
*.gem
-pkg
-rdoc
-webrat-*.html
-.bundle
+.bundle
+tmp
+*.rbc
View
12 Gemfile
@@ -1,2 +1,10 @@
-source :rubygems
-gemspec
+source 'http://rubygems.org'
+gemspec
+
+gem 'rails', '>= 3.1.0.rc1'
+
+gem 'sqlite3', :platforms => :ruby
+gem 'jdbc-sqlite3', :platforms => :jruby
+gem 'activerecord-jdbc-adapter', :platforms => :jruby
+
+gem 'ruby-debug', :platforms => :mri_18
View
@@ -1,124 +1,143 @@
PATH
remote: .
specs:
- steak (1.0.1)
- rspec (>= 1.3)
+ steak (2.0.0.beta1)
+ capybara (>= 1.0.0.beta1)
+ rspec-rails (>= 2.5.0)
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.3)
- actionpack (= 3.0.3)
- mail (~> 2.2.9)
- actionpack (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.6)
- tzinfo (~> 0.3.23)
- activemodel (3.0.3)
- activesupport (= 3.0.3)
- builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- activesupport (3.0.3)
- arel (2.0.4)
- builder (2.1.2)
- capybara (0.4.0)
- celerity (>= 0.7.9)
- culerity (>= 0.2.4)
+ actionmailer (3.1.0.rc1)
+ actionpack (= 3.1.0.rc1)
+ mail (~> 2.3.0)
+ actionpack (3.1.0.rc1)
+ activemodel (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6.0beta1)
+ rack (~> 1.3.0.beta2)
+ rack-cache (~> 1.0.1)
+ rack-mount (~> 0.8.1)
+ rack-test (~> 0.6.0)
+ sprockets (~> 2.0.0.beta.5)
+ tzinfo (~> 0.3.27)
+ activemodel (3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ bcrypt-ruby (~> 2.1.4)
+ builder (~> 3.0.0)
+ i18n (~> 0.6.0beta1)
+ activerecord (3.1.0.rc1)
+ activemodel (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ arel (~> 2.1.1)
+ tzinfo (~> 0.3.27)
+ activerecord-jdbc-adapter (1.1.1)
+ activeresource (3.1.0.rc1)
+ activemodel (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ activesupport (3.1.0.rc1)
+ multi_json (~> 1.0)
+ arel (2.1.1)
+ bcrypt-ruby (2.1.4)
+ bcrypt-ruby (2.1.4-java)
+ builder (3.0.0)
+ capybara (1.0.0.beta1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27)
- xpath (~> 0.1.2)
- celerity (0.8.4)
- childprocess (0.1.4)
- ffi (~> 0.6.3)
- culerity (0.2.12)
+ xpath (~> 0.1.4)
+ childprocess (0.1.9)
+ ffi (~> 1.0.6)
+ columnize (0.3.2)
diff-lcs (1.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- ffi (0.6.3)
- rake (>= 0.8.7)
- i18n (0.4.2)
- json_pure (1.4.6)
- mail (2.2.10)
- activesupport (>= 2.3.6)
- i18n (~> 0.4.1)
+ erubis (2.7.0)
+ ffi (1.0.9)
+ hike (1.0.0)
+ i18n (0.6.0)
+ jdbc-sqlite3 (3.6.14.2.056-java)
+ json_pure (1.5.1)
+ linecache (0.43)
+ mail (2.3.0)
+ i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
+ multi_json (1.0.3)
nokogiri (1.4.4)
polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.13)
+ rack (1.3.0)
+ rack-cache (1.0.2)
+ rack (>= 0.4)
+ rack-mount (0.8.1)
rack (>= 1.0.0)
- rack-test (0.5.6)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.0)
rack (>= 1.0)
- rails (3.0.3)
- actionmailer (= 3.0.3)
- actionpack (= 3.0.3)
- activerecord (= 3.0.3)
- activeresource (= 3.0.3)
- activesupport (= 3.0.3)
+ rails (3.1.0.rc1)
+ actionmailer (= 3.1.0.rc1)
+ actionpack (= 3.1.0.rc1)
+ activerecord (= 3.1.0.rc1)
+ activeresource (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
bundler (~> 1.0)
- railties (= 3.0.3)
- railties (3.0.3)
- actionpack (= 3.0.3)
- activesupport (= 3.0.3)
+ railties (= 3.1.0.rc1)
+ railties (3.1.0.rc1)
+ actionpack (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
- rspec (2.1.0)
- rspec-core (~> 2.1.0)
- rspec-expectations (~> 2.1.0)
- rspec-mocks (~> 2.1.0)
- rspec-core (2.1.0)
- rspec-expectations (2.1.0)
+ thor (~> 0.14.6)
+ rake (0.9.1)
+ rspec (2.6.0)
+ rspec-core (~> 2.6.0)
+ rspec-expectations (~> 2.6.0)
+ rspec-mocks (~> 2.6.0)
+ rspec-core (2.6.3)
+ rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.1.0)
- rspec-rails (2.1.0)
- rspec (~> 2.1.0)
+ rspec-mocks (2.6.0)
+ rspec-rails (2.6.1)
+ actionpack (~> 3.0)
+ activesupport (~> 3.0)
+ railties (~> 3.0)
+ rspec (~> 2.6.0)
+ ruby-debug (0.10.4)
+ columnize (>= 0.1)
+ ruby-debug-base (~> 0.10.4.0)
+ ruby-debug-base (0.10.4)
+ linecache (>= 0.3)
rubyzip (0.9.4)
- selenium-webdriver (0.1.0)
- childprocess (= 0.1.4)
- ffi (~> 0.6.3)
+ selenium-webdriver (0.2.1)
+ childprocess (>= 0.1.7)
+ ffi (>= 1.0.7)
json_pure
rubyzip
- sqlite3-ruby (1.3.2)
+ sprockets (2.0.0.beta.9)
+ hike (~> 1.0)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.3)
thor (0.14.6)
+ tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
- webrat (0.7.2)
- nokogiri (>= 1.2.0)
- rack (>= 1.0)
- rack-test (>= 0.5.3)
- xpath (0.1.2)
+ tzinfo (0.3.27)
+ xpath (0.1.4)
nokogiri (~> 1.3)
PLATFORMS
+ java
ruby
DEPENDENCIES
- capybara
- rails (>= 3.0.0)
- rspec (>= 1.3)
- rspec-rails (>= 2.0.0)
- sqlite3-ruby
+ activerecord-jdbc-adapter
+ jdbc-sqlite3
+ rails (>= 3.1.0.rc1)
+ ruby-debug
+ sqlite3
steak!
- webrat
View
@@ -1,27 +0,0 @@
-# Steak Release History #
-
-## Version 1.1.0 / 2011-01-15 ##
-
-[full changelog](https://github.com/cavalle/steak/compare/v1.0.1...v1.1.0)
-
-### Enhancements ###
-
-* If rspec-rails is present, a Steak spec now inherits from RequestExampleGroup which already takes care of including Webrat or Capybara. That means that `acceptance_helper.rb` no longer needs to include or initialize them (only change the default configuration if necessary)
-* Ensure that rake works in environments without rspec gem installed
-
-### Bugfixes ###
-
-* Prevents the generator from emptying spec/acceptance when running 'rails destroy steak:spec'.
-
-
-## Version 1.0.1 / 2010-12-26 ##
-
-[full changelog](https://github.com/cavalle/steak/compare/v1.0.0...v1.0.1)
-
-### Bugfixes ###
-
-* Fix `be_` and `have_` matchers not working with rspec 1.3
-
-## Version 1.0.0 / 2010-10-22 ##
-
-First stable version of Steak. [Announcement](http://groups.google.com/group/steakrb/browse_thread/thread/b90c86d0b7464a56)
View
@@ -1,4 +1,4 @@
-Copyright (c) 2009 Luismi Cavallé
+Copyright (c) 2009-2011 Luismi Cavallé
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Oops, something went wrong.

0 comments on commit 8a93a15

Please sign in to comment.