spec/whm/server_spec.rb in lumberg-1.0.6 vs spec/whm/server_spec.rb in lumberg-1.1.1

@@ -186,42 +186,33 @@
     describe "#account" do
       it "has an account accessor" do
         @whm.account.should be_an(Whm::Account)
       end
 
-      it "returns the same thing twice" do
-        @whm.account.should be_a(Whm::Account)
-        @whm.account.should respond_to(:list)
-
-        @whm.account.should be_a(Whm::Account)
-        @whm.account.should respond_to(:list)
+      it "sets the server" do
+        @whm.account.server.should == @whm
       end
-
     end
 
     describe "#dns" do
       it "has an dns accessor" do
         @whm.dns.should be_an(Whm::Dns)
       end
+
+      it "sets the server" do
+        @whm.dns.server.should == @whm
+      end
     end
 
     describe "#reseller" do
       it "has an reseller accessor" do
         @whm.reseller.should be_an(Whm::Reseller)
       end
-    end
 
-    describe "#method_missing" do
-      it "caches @vars" do
-        Whm.should_receive(:const_get).once.and_return(Whm::Account)
-        @whm.account
-        @whm.account
+      it "sets the server" do
+        @whm.reseller.server.should == @whm
       end
-
-      it "raises to super" do
-        expect { @whm.asdf }.to raise_error(NoMethodError)
-      end
     end
 
     describe "#list_ips" do
       use_vcr_cassette "whm/server/listips"
 
@@ -234,55 +225,35 @@
     end
 
     describe "#add_ip" do
       use_vcr_cassette "whm/server/addip"
 
-      it "requires an ip address" do
-        requires_attr('ip') { @whm.add_ip(:netmask => '255.255.255.250') }
-      end
-
-      it "requires a netmask" do
-        requires_attr('netmask') { @whm.add_ip(:ip => '123.123.123.123') }
-      end
-
       it "adds the ip address" do
         result = @whm.add_ip(:ip => '208.77.188.166', :netmask => '255.255.255.0')
         result[:success].should be_true
       end
     end
 
     describe "#delete_ip" do
       use_vcr_cassette "whm/server/delip"
 
-      it "requires an ip address" do
-        requires_attr('ip') { @whm.delete_ip }
-      end
-
       it "deletes the ip address" do
         result = @whm.delete_ip(:ip => '208.77.188.166')
         result[:success].should be_true
       end
     end
 
     describe "#set_hostname" do
       use_vcr_cassette "whm/server/sethostname"
 
-      it "requires a hostname" do
-        requires_attr('hostname') { @whm.set_hostname }
-      end
-
       it "changes the server's hostname" do
         result = @whm.set_hostname(:hostname => "myhost.com")
         result[:success].should be_true
       end
     end
 
     describe "#set_resolvers" do
       use_vcr_cassette "whm/server/setresolvers"
-
-      it "requires a nameserver1" do
-        requires_attr('nameserver1') { @whm.set_resolvers }
-      end
 
       it "configures the nameservers" do
         result = @whm.set_resolvers(:nameserver1 => "123.123.123.123", :nameserver2 => "123.123.123.124")
         result[:success].should be_true
       end