Unyank now responds to anything with 410 Gone

rubygems · Apr 20, 2015 · dc9ce8a · dc9ce8a
1 parent 1c1b0c6
commit dc9ce8a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 34 deletions.
diff --git a/app/controllers/api/v1/rubygems_controller.rb b/app/controllers/api/v1/rubygems_controller.rb
@@ -44,12 +44,7 @@ def yank
   end
 
   def unyank
-    if !@version.indexed?
-      @version.unyank!
-      render :text => "Successfully unyanked gem: #{@version.to_title}"
-    else
-      render :text => "The version #{params[:version]} is already indexed.", :status => :unprocessable_entity
-    end
+    render text: "Unyanking of gems is no longer supported.", status: :gone
   end
 
   def reverse_dependencies

diff --git a/test/functional/api/v1/rubygems_controller_test.rb b/test/functional/api/v1/rubygems_controller_test.rb
@@ -336,49 +336,26 @@ def self.should_respond_to(format)
         setup do
           put :unyank, :gem_name => @rubygem.to_param, :version => @v1.number
         end
-        should respond_with :success
-        #should change("the rubygem's indexed version count", :by => 1) { @rubygem.versions.indexed.count }
-        should "re-index 0.1.0" do
-          assert @v1.reload.indexed?
-        end
+        should respond_with :gone
       end
 
       context "ON PUT to unyank for version 0.1.2 and platform x86-darwin-10" do
         setup do
           put :unyank, :gem_name => @rubygem.to_param, :version => @v3.number, :platform => @v3.platform
         end
-        should respond_with :success
-        #should change("the rubygem's indexed version count", :by => 1) { @rubygem.versions.indexed.count }
-        should "re-index 0.1.2" do
-          assert @v3.reload.indexed?
-        end
+        should respond_with :gone
       end
 
 
       context "ON PUT to unyank for version 0.1.1" do
         setup do
           put :unyank, :gem_name => @rubygem.to_param, :version => @v2.number
         end
-        should respond_with :unprocessable_entity
+        should respond_with :gone
       end
     end
   end
 
-  def should_return_latest_gems(gems)
-    assert_equal 2, gems.length
-    gems.each {|g| assert g.is_a?(Hash) }
-    assert_equal @rubygem_2.attributes['name'], gems[0]['name']
-    assert_equal @rubygem_3.attributes['name'], gems[1]['name']
-  end
-
-  def should_return_just_updated_gems(gems)
-    assert_equal 3, gems.length
-    gems.each {|g| assert g.is_a?(Hash) }
-    assert_equal @rubygem_1.attributes['name'], gems[0]['name']
-    assert_equal @rubygem_2.attributes['name'], gems[1]['name']
-    assert_equal @rubygem_3.attributes['name'], gems[2]['name']
-  end
-
   context "No signed in-user" do
     context "On GET to index with JSON for a list of gems" do
       setup do

diff --git a/test/integration/yank_test.rb b/test/integration/yank_test.rb
@@ -58,7 +58,8 @@ class YankTest < SystemTest
     assert ! page.has_content?(@user.handle)
   end
 
-  test "undo a yank" do
+  test "undo a yank is not supported" do
+    create(:version, rubygem: @rubygem, number: "1.0.0", indexed: true)
     create(:version, rubygem: @rubygem, number: "0.0.0", indexed: false)
 
     page.driver.browser.header("Authorization", @user.api_key)
@@ -68,7 +69,8 @@ class YankTest < SystemTest
     assert page.has_content? "sandworm"
 
     click_link "sandworm"
-    assert page.has_content? "0.0.0"
+    assert page.has_content?("1.0.0")
+    assert ! page.has_content?("0.0.0")
   end
 
   teardown do