1 files changed, 74 insertions, 71 deletions
diff --git a/spec/ruby/library/net/ftp/chdir_spec.rb b/spec/ruby/library/net/ftp/chdir_spec.rb
index 4c10fa78b4..741c3c845e 100644
--- a/spec/ruby/library/net/ftp/chdir_spec.rb
+++ b/spec/ruby/library/net/ftp/chdir_spec.rb
@@ -1,99 +1,102 @@
 require_relative '../../../spec_helper'
-require_relative 'spec_helper'
-require_relative 'fixtures/server'
 
-describe "Net::FTP#chdir" do
-  before :each do
-    @server = NetFTPSpecs::DummyFTP.new
-    @server.serve_once
+ruby_version_is ""..."3.1" do
+  require_relative 'spec_helper'
+  require_relative 'fixtures/server'
 
-    @ftp = Net::FTP.new
-    @ftp.connect(@server.hostname, @server.server_port)
-  end
+  describe "Net::FTP#chdir" do
+    before :each do
+      @server = NetFTPSpecs::DummyFTP.new
+      @server.serve_once
 
-  after :each do
-    @ftp.quit rescue nil
-    @ftp.close
-    @server.stop
-  end
+      @ftp = Net::FTP.new
+      @ftp.connect(@server.hostname, @server.server_port)
+    end
+
+    after :each do
+      @ftp.quit rescue nil
+      @ftp.close
+      @server.stop
+    end
+
+    describe "when switching to the parent directory" do
+      it "sends the 'CDUP' command to the server" do
+        @ftp.chdir("..")
+        @ftp.last_response.should == "200 Command okay. (CDUP)\n"
+      end
+
+      it "returns nil" do
+        @ftp.chdir("..").should be_nil
+      end
+
+      it "does not raise a Net::FTPPermError when the response code is 500" do
+        @server.should_receive(:cdup).and_respond("500 Syntax error, command unrecognized.")
+        -> { @ftp.chdir("..") }.should_not raise_error(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 501" do
+        @server.should_receive(:cdup).and_respond("501 Syntax error in parameters or arguments.")
+        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 502" do
+        @server.should_receive(:cdup).and_respond("502 Command not implemented.")
+        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPTempError when the response code is 421" do
+        @server.should_receive(:cdup).and_respond("421 Service not available, closing control connection.")
+        -> { @ftp.chdir("..") }.should raise_error(Net::FTPTempError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 530" do
+        @server.should_receive(:cdup).and_respond("530 Not logged in.")
+        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      end
+
+      it "raises a Net::FTPPermError when the response code is 550" do
+        @server.should_receive(:cdup).and_respond("550 Requested action not taken.")
+        -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      end
+    end
 
-  describe "when switching to the parent directory" do
-    it "sends the 'CDUP' command to the server" do
-      @ftp.chdir("..")
-      @ftp.last_response.should == "200 Command okay. (CDUP)\n"
+    it "writes the 'CWD' command with the passed directory to the socket" do
+      @ftp.chdir("test")
+      @ftp.last_response.should == "200 Command okay. (CWD test)\n"
     end
 
     it "returns nil" do
-      @ftp.chdir("..").should be_nil
+      @ftp.chdir("test").should be_nil
     end
 
-    it "does not raise a Net::FTPPermError when the response code is 500" do
-      @server.should_receive(:cdup).and_respond("500 Syntax error, command unrecognized.")
-      -> { @ftp.chdir("..") }.should_not raise_error(Net::FTPPermError)
+    it "raises a Net::FTPPermError when the response code is 500" do
+      @server.should_receive(:cwd).and_respond("500 Syntax error, command unrecognized.")
+      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
     end
 
     it "raises a Net::FTPPermError when the response code is 501" do
-      @server.should_receive(:cdup).and_respond("501 Syntax error in parameters or arguments.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("501 Syntax error in parameters or arguments.")
+      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
     end
 
     it "raises a Net::FTPPermError when the response code is 502" do
-      @server.should_receive(:cdup).and_respond("502 Command not implemented.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("502 Command not implemented.")
+      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
     end
 
     it "raises a Net::FTPTempError when the response code is 421" do
-      @server.should_receive(:cdup).and_respond("421 Service not available, closing control connection.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPTempError)
+      @server.should_receive(:cwd).and_respond("421 Service not available, closing control connection.")
+      -> { @ftp.chdir("test") }.should raise_error(Net::FTPTempError)
     end
 
     it "raises a Net::FTPPermError when the response code is 530" do
-      @server.should_receive(:cdup).and_respond("530 Not logged in.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("530 Not logged in.")
+      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
     end
 
     it "raises a Net::FTPPermError when the response code is 550" do
-      @server.should_receive(:cdup).and_respond("550 Requested action not taken.")
-      -> { @ftp.chdir("..") }.should raise_error(Net::FTPPermError)
+      @server.should_receive(:cwd).and_respond("550 Requested action not taken.")
+      -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
     end
   end
-
-  it "writes the 'CWD' command with the passed directory to the socket" do
-    @ftp.chdir("test")
-    @ftp.last_response.should == "200 Command okay. (CWD test)\n"
-  end
-
-  it "returns nil" do
-    @ftp.chdir("test").should be_nil
-  end
-
-  it "raises a Net::FTPPermError when the response code is 500" do
-    @server.should_receive(:cwd).and_respond("500 Syntax error, command unrecognized.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 501" do
-    @server.should_receive(:cwd).and_respond("501 Syntax error in parameters or arguments.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 502" do
-    @server.should_receive(:cwd).and_respond("502 Command not implemented.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPTempError when the response code is 421" do
-    @server.should_receive(:cwd).and_respond("421 Service not available, closing control connection.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPTempError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 530" do
-    @server.should_receive(:cwd).and_respond("530 Not logged in.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
-
-  it "raises a Net::FTPPermError when the response code is 550" do
-    @server.should_receive(:cwd).and_respond("550 Requested action not taken.")
-    -> { @ftp.chdir("test") }.should raise_error(Net::FTPPermError)
-  end
 end