API tools faq
paste
Guest User

Untitled

a guest
Feb 20th, 2018
106
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.72 KB | None | 0 0
raw download clone embed print report
  1. From f6ae7135d1d3221b83ec951490219ab37a9d2e17 Mon Sep 17 00:00:00 2001
  2. From: Dmytro Shteflyuk <kpumuk@kpumuk.info>
  3. Date: Mon, 6 Oct 2008 10:39:15 +0300
  4. Subject: [PATCH] Update mirror 'vendor/plugins/rspec-rails/' to '8555bd5'
  5.  
  6. ---
  7. .braids | 24 ++++++------
  8. vendor/plugins/rspec-rails/History.txt | 21 ++++++++++-
  9. vendor/plugins/rspec-rails/Rakefile | 3 +-
  10. .../lib/spec/rails/example/assigns_hash_proxy.rb | 23 +++++------
  11. .../plugins/rspec-rails/lib/spec/rails/version.rb | 4 +-
  12. vendor/plugins/rspec-rails/rspec-rails.gemspec | 16 ++++----
  13. .../spec/rails/autotest/mappings_spec.rb | 2 +-
  14. .../spec/rails/example/assigns_hash_proxy_spec.rb | 41 +++++++++++++++++--
  15. .../spec/rails/example/controller_spec_spec.rb | 7 +++
  16. .../controllers/controller_spec_controller.rb | 5 ++
  17. 10 files changed, 102 insertions(+), 44 deletions(-)
  18.  
  19. diff --git a/.braids b/.braids
  20. index cf46f87..4ef7302 100644
  21. --- a/.braids
  22. +++ b/.braids
  23. @@ -1,30 +1,30 @@
  24. ---
  25. vendor/plugins/rspec-rails:
  26. squashed: true
  27. - lock: 50dd2116a855eac54825661d2003c215b84d566c
  28. + lock: 8555bd5478503e91e2e04c282b9c5087c1e8663d
  29. type: git
  30. url: git://github.com/dchelimsky/rspec-rails.git
  31. - revision: 50dd2116a855eac54825661d2003c215b84d566c
  32. + revision: 8555bd5478503e91e2e04c282b9c5087c1e8663d
  33. branch: master
  34. remote: braid/vendor/plugins/rspec-rails
  35. -vendor/plugins/rspec:
  36. - squashed: true
  37. - lock: 36c1100ef19fb7861271c62b930d4bc91d2f1502
  38. - type: git
  39. - url: git://github.com/dchelimsky/rspec.git
  40. - revision: 36c1100ef19fb7861271c62b930d4bc91d2f1502
  41. - branch: master
  42. - remote: braid/vendor/plugins/rspec
  43. vendor/plugins/magic-enum:
  44. squashed: true
  45. - type: git
  46. url: git://github.com/kovyrin/magic-enum.git
  47. + type: git
  48. revision: 2a4a230658bda39828f8868bad045ffe48c0c245
  49. branch: master
  50. remote: braid/vendor/plugins/magic-enum
  51. +vendor/plugins/rspec:
  52. + squashed: true
  53. + url: git://github.com/dchelimsky/rspec.git
  54. + type: git
  55. + lock: 36c1100ef19fb7861271c62b930d4bc91d2f1502
  56. + revision: 36c1100ef19fb7861271c62b930d4bc91d2f1502
  57. + branch: master
  58. + remote: braid/vendor/plugins/rspec
  59. vendor/plugins/bounces_handler:
  60. squashed: true
  61. - url: git://github.com/kovyrin/bounces-handler.git
  62. type: git
  63. + url: git://github.com/kovyrin/bounces-handler.git
  64. branch: master
  65. remote: braid/git/vendor/plugins/bounces-handler/master
  66. diff --git a/vendor/plugins/rspec-rails/History.txt b/vendor/plugins/rspec-rails/History.txt
  67. index b372f1b..65ec00a 100644
  68. --- a/vendor/plugins/rspec-rails/History.txt
  69. +++ b/vendor/plugins/rspec-rails/History.txt
  70. @@ -1,4 +1,23 @@
  71. -=== Version 1.1.5
  72. +=== Version 1.1.8 / 2008-10-03
  73. +
  74. +* 2 bug fixes
  75. +
  76. + * correctly handle assigns that are false. Fixes #552.
  77. + * ensure that NotYetImplemented examples report as pending (fixed in rspec, not rspec-rails). Fixes #553.
  78. +
  79. +=== Version 1.1.7 / 2008-10-02
  80. +
  81. +* 1 bug fix
  82. +
  83. + * depend on the correct version of rspec
  84. +
  85. +=== Version 1.1.6 / 2008-10-02
  86. +
  87. +* 1 bug fix
  88. +
  89. + * fixed regression where values assigned to the assigns hash were not accessible from the example (#549)
  90. +
  91. +=== Version 1.1.5 / 2008-09-28
  92.  
  93. IMPORTANT: use 'script/autospec' (or just 'autospec' if you have the rspec gem
  94. installed) instead of 'autotest'. We changed the way autotest discovers rspec
  95. diff --git a/vendor/plugins/rspec-rails/Rakefile b/vendor/plugins/rspec-rails/Rakefile
  96. index 09fd295..768b651 100644
  97. --- a/vendor/plugins/rspec-rails/Rakefile
  98. +++ b/vendor/plugins/rspec-rails/Rakefile
  99. @@ -15,8 +15,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
  100. p.description = "Behaviour Driven Development for Ruby on Rails."
  101. p.rubyforge_name = 'rspec'
  102. p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
  103. - p.extra_deps = [["rspec","1.1.5"]]
  104. - p.spec_extras = { :to_ruby => lambda { |str| File.open("rspec-rails.gemspec", "w+"){ |f| f.puts str } } }
  105. + p.extra_deps = [["rspec","1.1.8"]]
  106. end
  107.  
  108. ['audit','test','test_deps','default','publish_docs','post_blog', 'release'].each do |task|
  109. diff --git a/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb b/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb
  110. index a9b1efa..2962a4f 100644
  111. --- a/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb
  112. +++ b/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb
  113. @@ -3,26 +3,23 @@ module Spec
  114. module Example
  115. class AssignsHashProxy #:nodoc:
  116. def initialize(example_group, &block)
  117. - @block = block
  118. + @target = block.call
  119. @example_group = example_group
  120. end
  121.  
  122. - def [](ivar)
  123. - if assigns.include?(ivar.to_s)
  124. - assigns[ivar.to_s]
  125. - elsif assigns.include?(ivar)
  126. - assigns[ivar]
  127. - else
  128. - nil
  129. - end
  130. + def [](key)
  131. + return false if assigns[key] == false
  132. + return false if assigns[key.to_s] == false
  133. + assigns[key] || assigns[key.to_s] || @target.instance_variable_get("@#{key}")
  134. end
  135.  
  136. - def []=(ivar, val)
  137. - @block.call.instance_variable_set("@#{ivar}", val)
  138. + def []=(key, val)
  139. + @target.instance_variable_set("@#{key}", val)
  140. end
  141.  
  142. - def delete(name)
  143. - assigns.delete(name.to_s)
  144. + def delete(key)
  145. + assigns.delete(key.to_s)
  146. + @target.instance_variable_set("@#{key}", nil)
  147. end
  148.  
  149. def each(&block)
  150. diff --git a/vendor/plugins/rspec-rails/lib/spec/rails/version.rb b/vendor/plugins/rspec-rails/lib/spec/rails/version.rb
  151. index 2c8b983..fb7037b 100644
  152. --- a/vendor/plugins/rspec-rails/lib/spec/rails/version.rb
  153. +++ b/vendor/plugins/rspec-rails/lib/spec/rails/version.rb
  154. @@ -4,11 +4,11 @@ module Spec
  155. unless defined? MAJOR
  156. MAJOR = 1
  157. MINOR = 1
  158. - TINY = 5
  159. + TINY = 8
  160.  
  161. STRING = [MAJOR, MINOR, TINY].join('.')
  162.  
  163. - SUMMARY = "rspec-rails version #{STRING}"
  164. + SUMMARY = "rspec-rails #{STRING}"
  165. end
  166. end
  167. end
  168. diff --git a/vendor/plugins/rspec-rails/rspec-rails.gemspec b/vendor/plugins/rspec-rails/rspec-rails.gemspec
  169. index 8068dbb..67ff738 100644
  170. --- a/vendor/plugins/rspec-rails/rspec-rails.gemspec
  171. +++ b/vendor/plugins/rspec-rails/rspec-rails.gemspec
  172. @@ -1,10 +1,10 @@
  173. Gem::Specification.new do |s|
  174. s.name = %q{rspec-rails}
  175. - s.version = "1.1.5"
  176. + s.version = "1.1.8"
  177.  
  178. s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  179. s.authors = ["RSpec Development Team"]
  180. - s.date = %q{2008-09-28}
  181. + s.date = %q{2008-10-03}
  182. s.description = %q{Behaviour Driven Development for Ruby on Rails.}
  183. s.email = ["rspec-devel@rubyforge.org"]
  184. s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "generators/rspec/templates/previous_failures.txt"]
  185. @@ -14,22 +14,22 @@ Gem::Specification.new do |s|
  186. s.rdoc_options = ["--main", "README.txt"]
  187. s.require_paths = ["lib"]
  188. s.rubyforge_project = %q{rspec}
  189. - s.rubygems_version = %q{1.2.0}
  190. - s.summary = %q{rspec-rails version 1.1.5}
  191. + s.rubygems_version = %q{1.3.0}
  192. + s.summary = %q{rspec-rails 1.1.8}
  193.  
  194. if s.respond_to? :specification_version then
  195. current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
  196. s.specification_version = 2
  197.  
  198. - if current_version >= 3 then
  199. - s.add_runtime_dependency(%q<rspec>, ["= 1.1.5"])
  200. + if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
  201. + s.add_runtime_dependency(%q<rspec>, ["= 1.1.8"])
  202. s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
  203. else
  204. - s.add_dependency(%q<rspec>, ["= 1.1.5"])
  205. + s.add_dependency(%q<rspec>, ["= 1.1.8"])
  206. s.add_dependency(%q<hoe>, [">= 1.7.0"])
  207. end
  208. else
  209. - s.add_dependency(%q<rspec>, ["= 1.1.5"])
  210. + s.add_dependency(%q<rspec>, ["= 1.1.8"])
  211. s.add_dependency(%q<hoe>, [">= 1.7.0"])
  212. end
  213. end
  214. diff --git a/vendor/plugins/rspec-rails/spec/rails/autotest/mappings_spec.rb b/vendor/plugins/rspec-rails/spec/rails/autotest/mappings_spec.rb
  215. index 3ebf890..7a05cf2 100644
  216. --- a/vendor/plugins/rspec-rails/spec/rails/autotest/mappings_spec.rb
  217. +++ b/vendor/plugins/rspec-rails/spec/rails/autotest/mappings_spec.rb
  218. @@ -1,6 +1,6 @@
  219. require File.dirname(__FILE__) + '/../../spec_helper'
  220. require File.join(File.dirname(__FILE__), *%w[.. .. .. lib autotest rails_rspec])
  221. -require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest_matchers])
  222. +require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest autotest_matchers])
  223.  
  224. describe Autotest::RailsRspec, "file mapping" do
  225. before(:each) do
  226. diff --git a/vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb b/vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb
  227. index e397819..d53657e 100644
  228. --- a/vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb
  229. +++ b/vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb
  230. @@ -27,7 +27,7 @@ describe "AssignsHashProxy" do
  231.  
  232. it "should access object's assigns with a string" do
  233. @object.assigns['foo'] = 'bar'
  234. - @proxy[:foo].should == 'bar'
  235. + @proxy['foo'].should == 'bar'
  236. end
  237.  
  238. it "should access object's assigns with a symbol" do
  239. @@ -35,7 +35,17 @@ describe "AssignsHashProxy" do
  240. @proxy[:foo].should == 'bar'
  241. end
  242.  
  243. - it "iterates through each element like a Hash" do
  244. + it "should access object's ivars with a string" do
  245. + @object.instance_variable_set('@foo', 'bar')
  246. + @proxy['foo'].should == 'bar'
  247. + end
  248. +
  249. + it "should access object's ivars with a symbol" do
  250. + @object.instance_variable_set('@foo', 'bar')
  251. + @proxy[:foo].should == 'bar'
  252. + end
  253. +
  254. + it "should iterate through each element like a Hash" do
  255. values = {
  256. 'foo' => 1,
  257. 'bar' => 2,
  258. @@ -51,15 +61,36 @@ describe "AssignsHashProxy" do
  259. end
  260. end
  261.  
  262. - it "deletes the element of passed in key" do
  263. + it "should delete the ivar of passed in key" do
  264. + @object.instance_variable_set('@foo', 'bar')
  265. + @proxy.delete('foo')
  266. + @proxy['foo'].should be_nil
  267. + end
  268. +
  269. + it "should delete the assigned element of passed in key" do
  270. @object.assigns['foo'] = 'bar'
  271. - @proxy.delete('foo').should == 'bar'
  272. + @proxy.delete('foo')
  273. @proxy['foo'].should be_nil
  274. end
  275.  
  276. - it "detects the presence of a key" do
  277. + it "should detect the presence of a key in assigns" do
  278. @object.assigns['foo'] = 'bar'
  279. @proxy.has_key?('foo').should == true
  280. @proxy.has_key?('bar').should == false
  281. end
  282. +
  283. + it "should expose values set in example back to the example" do
  284. + @proxy[:foo] = 'bar'
  285. + @proxy[:foo].should == 'bar'
  286. + end
  287. +
  288. + it "should allow assignment of false via proxy" do
  289. + @proxy['foo'] = false
  290. + @proxy['foo'].should be_false
  291. + end
  292. +
  293. + it "should allow assignment of false" do
  294. + @object.instance_variable_set('@foo',false)
  295. + @proxy['foo'].should be_false
  296. + end
  297. end
  298. diff --git a/vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb b/vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb
  299. index da8bb34..18cc0d3 100644
  300. --- a/vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb
  301. +++ b/vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb
  302. @@ -6,6 +6,8 @@ require 'controller_spec_controller'
  303. controller_name :controller_spec
  304. integrate_views if mode == 'integration'
  305.  
  306. + specify "this example should be pending, not an error"
  307. +
  308. it "should provide controller.session as session" do
  309. get 'action_with_template'
  310. session.should equal(controller.session)
  311. @@ -173,6 +175,11 @@ require 'controller_spec_controller'
  312. assigns[:indirect_assigns_key].should == :indirect_assigns_key_value
  313. end
  314.  
  315. + it "should expose instance vars through the assigns hash that are set to false" do
  316. + get 'action_that_assigns_false_to_a_variable'
  317. + assigns[:a_variable].should be_false
  318. + end
  319. +
  320. it "should NOT complain when calling should_receive with arguments other than :render" do
  321. controller.should_receive(:anything_besides_render)
  322. lambda {
  323. diff --git a/vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb b/vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb
  324. index a8e75bc..97ec6bc 100644
  325. --- a/vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb
  326. +++ b/vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb
  327. @@ -85,6 +85,11 @@ class ControllerSpecController < ActionController::Base
  328. def action_with_skipped_before_filter
  329. render :text => ""
  330. end
  331. +
  332. + def action_that_assigns_false_to_a_variable
  333. + @a_variable = false
  334. + render :text => ""
  335. + end
  336. end
  337.  
  338. class ControllerInheritingFromApplicationControllerController < ApplicationController
  339. --
  340. 1.6.0.2
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!