Merge pull request hotsh#639 from carols10cents/issue_636

Issue 636
amaia · Sep 8, 2012 · bc2bf60 · bc2bf60
2 parents b6527ba + 2a0cc83
commit bc2bf60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/users/edit.haml b/app/views/users/edit.haml
@@ -30,8 +30,7 @@
       - if @user.twitter?
         %img.linked-image{:src => asset_path("twitter_newbird_blue.png"), :alt => "Twitter Account"}
         .linked-name="@#{@user.twitter.nickname}"
-        %form.profile-update{:action => "/users/#{@user.username}/auth/twitter", :method => "POST", :name => "profile_update_form"}
-          %input{:type => "hidden", :name => "_method", :value => "delete"}
+        = form_tag "/users/#{@user.username}/auth/twitter", :method => "delete", :class => "profile-update", :name => "profile_update_form" do
           %input.button{:type => "submit", :value => "Remove"}
       - else
         %form.profile-update{:action => "/auth/twitter", :method => "GET", :name => "profile_update_form"}

diff --git a/test/acceptance/acceptance_helper.rb b/test/acceptance/acceptance_helper.rb
@@ -16,6 +16,7 @@ module AcceptanceHelper
   include ShowMeTheCookies
 
   OmniAuth.config.test_mode = true
+  ActionController::Base.allow_forgery_protection = true
 
   if ENV["ENABLE_HTTPS"] == "yes"
     Capybara.app_host = 'https://www.example.com'