Merge pull request #146 from cyberious/SpecTests

(MODULES-2498) Fix the check on removal

Author: phongdly

spec/acceptance/sqlserver_instance_spec.rb

@@ -4,12 +4,13 @@
 
 host = find_only_one("sql_host")
 
+def new_random_instance_name
+  ("MSSQL" + SecureRandom.hex(4)).upcase.to_s
+end
+
 describe "sqlserver_instance", :node => host do
   version = host['sql_version'].to_s
 
-  def new_random_instance_name
-    return ("MSSQL" + SecureRandom.hex(4)).upcase.to_s
-  end
 
   def ensure_sqlserver_instance(host, features, inst_name, ensure_val = 'present')
     manifest = <<-MANIFEST
@@ -24,7 +25,7 @@ def ensure_sqlserver_instance(host, features, inst_name, ensure_val = 'present')
     }
     MANIFEST
 
-    mssql_features  = features.map{ |x| "'#{x}'"}.join(', ')
+    mssql_features = features.map { |x| "'#{x}'" }.join(', ')
 
     pp = ERB.new(manifest).result(binding)
 
@@ -34,87 +35,83 @@ def ensure_sqlserver_instance(host, features, inst_name, ensure_val = 'present')
   end
 
   context "Create an instance", {:testrail => ['88978', '89028', '89031', '89043', '89061']} do
+    inst_name = new_random_instance_name
+    features = ['SQL', 'SQLEngine', 'Replication', 'FullText', 'DQ']
 
-    before(:all) do
-      @inst_name = new_random_instance_name
-      @features = ['SQL', 'SQLEngine', 'Replication', 'FullText', 'DQ']
-    end
-
-    it "create #{@inst_name} instance" do
-      ensure_sqlserver_instance(host, @features, @inst_name)
+    it "create #{inst_name} instance" do
+      ensure_sqlserver_instance(host, features, inst_name)
 
       validate_sql_install(host, {:version => version}) do |r|
-        expect(r.stdout).to match(/#{Regexp.new(@inst_name)}/)
+        expect(r.stdout).to match(/#{Regexp.new(inst_name)}/)
       end
     end
 
-    it "remove #{@inst_name} instance" do
-      ensure_sqlserver_instance(host, @features, @inst_name, 'absent')
+    it "remove #{inst_name} instance" do
+      ensure_sqlserver_instance(host, features, inst_name, 'absent')
 
+      # Ensure all features for this instance are removed and the defaults are left alone
       validate_sql_install(host, {:version => version}) do |r|
-        expect(r.stdout).not_to match(/#{Regexp.new(@inst_name)}/)
+        expect(r.stdout).to match(/MSSQLSERVER\s+Database Engine Services/)
+        expect(r.stdout).to match(/MSSQLSERVER\s+SQL Server Replication/)
+        expect(r.stdout).to match(/MSSQLSERVER\s+Data Quality Services/)
+        expect(r.stdout).not_to match(/#{inst_name}\s+Database Engine Services/)
+        expect(r.stdout).not_to match(/#{inst_name}\s+SQL Server Replication/)
+        expect(r.stdout).not_to match(/#{inst_name}\s+Data Quality Services/)
       end
     end
   end
 
   context "Feature has only one 'SQL'", {:testrail => ['89032']} do
-
-    before(:all) do
-      @inst_name = new_random_instance_name
-      @features = ['SQL']
-    end
+    inst_name = new_random_instance_name
+    features = ['SQL']
 
     after(:all) do
-      ensure_sqlserver_instance(host, @features, @inst_name, 'absent')
+      ensure_sqlserver_instance(host, features, inst_name, 'absent')
     end
 
-    it "create #{@inst_name} instance with only one SQL feature" do
-      ensure_sqlserver_instance(host, @features, @inst_name)
+    it "create #{inst_name} instance with only one SQL feature" do
+      ensure_sqlserver_instance(host, features, inst_name)
 
       validate_sql_install(host, {:version => version}) do |r|
-        expect(r.stdout).to match(/#{Regexp.new(@inst_name)}/)
+        expect(r.stdout).to match(/#{inst_name}\s+Database Engine Services/)
+        expect(r.stdout).to match(/#{inst_name}\s+SQL Server Replication/)
+        expect(r.stdout).to match(/#{inst_name}\s+Data Quality Services/)
       end
     end
   end
 
   context "Feature has only one 'RS'", {:testrail => ['89034']} do
-
-    before(:all) do
-      @inst_name = new_random_instance_name
-      @features = ['RS']
-    end
+   inst_name = new_random_instance_name
+   features = ['RS']
 
     after(:all) do
-      ensure_sqlserver_instance(host, @features, @inst_name, 'absent')
+      ensure_sqlserver_instance(host, features, inst_name, 'absent')
     end
 
-    it "create #{@inst_name} instance with only one RS feature" do
-      ensure_sqlserver_instance(host, @features, @inst_name)
+    it "create #{inst_name} instance with only one RS feature" do
+      ensure_sqlserver_instance(host, features, inst_name)
 
       validate_sql_install(host, {:version => version}) do |r|
-        expect(r.stdout).to match(/#{Regexp.new(@inst_name)}/)
+        expect(r.stdout).to match(/#{inst_name}\s+Reporting Services/)
       end
     end
   end
 
   context "Feature has only one 'AS'", {:testrail => ['89033']} do
-
-    before(:all) do
-      @inst_name = new_random_instance_name
-      @features = ['AS']
-    end
+    inst_name = new_random_instance_name
+    features = ['AS']
 
     after(:all) do
-      ensure_sqlserver_instance(host, @features, @inst_name, 'absent')
+      ensure_sqlserver_instance(host, features, inst_name, 'absent')
     end
 
     #skip below test due to ticket MODULES-2379, when the ticket was resolved
     # will change xit to it
-    xit "create #{@inst_name} instance with only one AS feature" do
-      ensure_sqlserver_instance(host, @features, @inst_name)
+    xit "create #{inst_name} instance with only one AS feature" do
+      ensure_sqlserver_instance(host, features, inst_name)
 
       validate_sql_install(host, {:version => version}) do |r|
-        expect(r.stdout).to match(/#{Regexp.new(@inst_name)}/)
+        expect(r.stdout).to match(/#{Regexp.new(inst_name)}/)
       end
     end
   end