spec/unit/plugins/hostname_spec.rb in ohai-8.26.1 vs spec/unit/plugins/hostname_spec.rb in ohai-13.0.0

@@ -14,62 +14,37 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 
 describe Ohai::System, "hostname plugin" do
   before(:each) do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:default)
     allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
   end
 
-  context "when sigar is not installed" do
-    before(:each) do
-      allow(@plugin).to receive(:sigar_is_available?).and_return(false)
-      expect(@plugin).not_to receive(:get_fqdn_from_sigar)
-      allow(@plugin).to receive(:resolve_fqdn).and_return("katie.bethell")
-    end
-    it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
+  context "default behavior"
+  before(:each) do
+    allow(@plugin).to receive(:resolve_fqdn).and_return("katie.bethell")
+  end
+  it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
-    it "should use #resolve_fqdn to find the fqdn" do
-      @plugin.run
-      expect(@plugin[:fqdn]).to eq("katie.bethell")
-    end
+  it "should use #resolve_fqdn to find the fqdn" do
+    @plugin.run
+    expect(@plugin[:fqdn]).to eq("katie.bethell")
+  end
 
-    it "should set the domain to everything after the first dot of the fqdn" do
-      @plugin.run
-      expect(@plugin[:domain]).to eq("bethell")
-    end
-
-    it "should set the [short] hostname to everything before the first dot of the fqdn" do
-      @plugin.run
-      expect(@plugin[:hostname]).to eq("katie")
-    end
+  it "should set the domain to everything after the first dot of the fqdn" do
+    @plugin.run
+    expect(@plugin[:domain]).to eq("bethell")
   end
 
-  context "when sigar is installed" do
-    before(:each) do
-      allow(@plugin).to receive(:sigar_is_available?).and_return(true)
-      allow(@plugin).to receive(:get_fqdn_from_sigar).and_return("katie.bethell")
-    end
-    it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
-    it "should set the fqdn to the returned value from sigar" do
-      @plugin.run
-      expect(@plugin[:fqdn]).to eq("katie.bethell")
-    end
-
-    it "should set the domain to everything after the first dot of the fqdn" do
-      @plugin.run
-      expect(@plugin[:domain]).to eq("bethell")
-    end
-
-    it "should set the [short] hostname to everything before the first dot of the fqdn" do
-      @plugin.run
-      expect(@plugin[:hostname]).to eq("katie")
-    end
+  it "should set the [short] hostname to everything before the first dot of the fqdn" do
+    @plugin.run
+    expect(@plugin[:hostname]).to eq("katie")
   end
 
   context "when a system has a bare hostname without a FQDN" do
     before(:each) do
       allow(@plugin).to receive(:collect_os).and_return(:default)