diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/application_spec.rb | 10 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/spec/controllers/application_spec.rb b/spec/controllers/application_spec.rb deleted file mode 100644 index af2ea1634..000000000 --- a/spec/controllers/application_spec.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../spec_helper' - -describe ApplicationController, "when authenticating user" do - integrate_views - fixtures :users - -# it "blah" do -# end -end - diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d79b36f94..516ad998c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -72,9 +72,9 @@ if $tempfilecount.nil? # Hook into the process function, so can automatically get HTML after each request alias :original_process :process - def process(action, parameters = nil, session = nil, flash = nil) + def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET') # Call original process function - self.original_process(action, parameters, session, flash) + self.original_process(action, parameters, session, flash, http_method) # XXX Is there a better way to check this than calling a private method? return unless @response.template.controller.instance_eval { integrate_views? } |