From 658f5b23d934e7c6a3a8551c8d4cee63ca7d97bb Mon Sep 17 00:00:00 2001
From: Glavin Wiechert <glavin.wiechert@gmail.com>
Date: Wed, 10 Jun 2015 13:11:20 -0300
Subject: [PATCH] Fix typo in beautify-languages-spec causing failing tests to
 pass

---
 examples/nested-jsbeautifyrc/.jsbeautifyrc    |  1 +
 .../ruby/expected/test.rb                     |  6 ++---
 .../ruby/original/test.rb                     |  0
 .../sass/expected/extra-line-test.scss        |  6 +++--
 .../sass/expected/insert-lines.scss           |  4 +--
 .../{insert-lines.scss => _insert-lines.scss} |  0
 .../typescript/expected/test2.ts              |  2 +-
 .../expected/basic-page-using-detail.page     |  6 ++---
 .../visualforce/expected/basic-page.page      |  4 +--
 .../expected/page-with-inputfield.page        | 25 ++++++++-----------
 .../expected/page-with-outputfield.page       | 13 ++++------
 spec/beautify-languages-spec.coffee           |  3 ++-
 12 files changed, 32 insertions(+), 38 deletions(-)
 rename examples/{simple-jsbeautifyrc => nested-jsbeautifyrc}/ruby/expected/test.rb (57%)
 rename examples/{simple-jsbeautifyrc => nested-jsbeautifyrc}/ruby/original/test.rb (100%)
 rename examples/nested-jsbeautifyrc/sass/original/{insert-lines.scss => _insert-lines.scss} (100%)

diff --git a/examples/nested-jsbeautifyrc/.jsbeautifyrc b/examples/nested-jsbeautifyrc/.jsbeautifyrc
index feb1813..53b6f08 100644
--- a/examples/nested-jsbeautifyrc/.jsbeautifyrc
+++ b/examples/nested-jsbeautifyrc/.jsbeautifyrc
@@ -18,6 +18,7 @@
     indent_char: " "
     indent_size: 2
     preserve_newlines: true
+    # newline_between_rules: true
   js:
     indent_size: 2
     indent_char: " "
diff --git a/examples/simple-jsbeautifyrc/ruby/expected/test.rb b/examples/nested-jsbeautifyrc/ruby/expected/test.rb
similarity index 57%
rename from examples/simple-jsbeautifyrc/ruby/expected/test.rb
rename to examples/nested-jsbeautifyrc/ruby/expected/test.rb
index e5e0c9d..e76cff2 100644
--- a/examples/simple-jsbeautifyrc/ruby/expected/test.rb
+++ b/examples/nested-jsbeautifyrc/ruby/expected/test.rb
@@ -2,7 +2,7 @@
 
 conn_hash = { hosts: [
 
-  { login: login, passcode: passcode, host: host, port: port }
+    { login: login, passcode: passcode, host: host, port: port }
 ],
               reliable: false, # Override default
               connect_headers: conn_hdrs
@@ -11,9 +11,9 @@ conn_hash = { hosts: [
 
 hash = { hosts: [
 
-  { login: user, passcode: password, host: 'noonehome', port: 2525 },
+    { login: user, passcode: password, host: 'noonehome', port: 2525 },
 
-  { login: user, passcode: password, host: host, port: port }
+    { login: user, passcode: password, host: host, port: port }
 
 ],
 
diff --git a/examples/simple-jsbeautifyrc/ruby/original/test.rb b/examples/nested-jsbeautifyrc/ruby/original/test.rb
similarity index 100%
rename from examples/simple-jsbeautifyrc/ruby/original/test.rb
rename to examples/nested-jsbeautifyrc/ruby/original/test.rb
diff --git a/examples/nested-jsbeautifyrc/sass/expected/extra-line-test.scss b/examples/nested-jsbeautifyrc/sass/expected/extra-line-test.scss
index 7d2ad4e..9958216 100644
--- a/examples/nested-jsbeautifyrc/sass/expected/extra-line-test.scss
+++ b/examples/nested-jsbeautifyrc/sass/expected/extra-line-test.scss
@@ -2,11 +2,13 @@
 .ttl {
   margin-bottom: 10px;
 }
+
+
 // https://github.com/Glavin001/atom-beautify/issues/180
 .a {
   color: #fff;
-  
+
   .b {
     color: #999;
   }
-}
\ No newline at end of file
+}
diff --git a/examples/nested-jsbeautifyrc/sass/expected/insert-lines.scss b/examples/nested-jsbeautifyrc/sass/expected/insert-lines.scss
index f4da8db..7049e4c 100644
--- a/examples/nested-jsbeautifyrc/sass/expected/insert-lines.scss
+++ b/examples/nested-jsbeautifyrc/sass/expected/insert-lines.scss
@@ -1,7 +1,7 @@
 body {
- background: red;
+  background: red;
 }
 
 h1 {
- font-size: 16px;
+  font-size: 16px;
 }
\ No newline at end of file
diff --git a/examples/nested-jsbeautifyrc/sass/original/insert-lines.scss b/examples/nested-jsbeautifyrc/sass/original/_insert-lines.scss
similarity index 100%
rename from examples/nested-jsbeautifyrc/sass/original/insert-lines.scss
rename to examples/nested-jsbeautifyrc/sass/original/_insert-lines.scss
diff --git a/examples/simple-jsbeautifyrc/typescript/expected/test2.ts b/examples/simple-jsbeautifyrc/typescript/expected/test2.ts
index fd1f096..6e69bd3 100644
--- a/examples/simple-jsbeautifyrc/typescript/expected/test2.ts
+++ b/examples/simple-jsbeautifyrc/typescript/expected/test2.ts
@@ -53,4 +53,4 @@ if (x === 3) {
       console.log("yes");
     }
   }
-}
+}
\ No newline at end of file
diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page
index 3a0bf5c..039614e 100644
--- a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page
@@ -1,5 +1,3 @@
 <apex:page standardController="Contact">
-
-  <apex:detail />
-
-</apex:page>  
\ No newline at end of file
+  <apex:detail/>
+</apex:page>
\ No newline at end of file
diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page
index d10e22e..057fa14 100644
--- a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page
@@ -1,5 +1,3 @@
 <apex:page standardController="Contact">
-
-  <apex:sectionHeader title="{!contact.firstname}" subtitle="{!contact.account.name}"/>
-
+  <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
 </apex:page>
\ No newline at end of file
diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page
index 643f0b8..e915df0 100644
--- a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page
@@ -1,17 +1,14 @@
 <apex:page standardController="Contact">
-
-  <apex:sectionHeader title="{!contact.firstname}" subtitle="{!contact.account.name}"/>
-
-  <apex:form >
-  <apex:pageBlock title="Contact">
-    <apex:pageBlockSection title="Editing">
-       <apex:inputfield value="{!contact.firstname}"/>
-       <apex:inputfield value="{!contact.lastname}"/>
-       <apex:inputfield value="{!contact.salutation}"/>
-       <apex:inputfield value="{!contact.birthdate}"/>
-       <apex:commandButton value="Save" action="{!save}"/>
-    </apex:pageBlockSection>
-  </apex:pageBlock>
+  <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
+  <apex:form>
+    <apex:pageBlock title="Contact">
+      <apex:pageBlockSection title="Editing">
+        <apex:inputfield value="{!contact.firstname}"/>
+        <apex:inputfield value="{!contact.lastname}"/>
+        <apex:inputfield value="{!contact.salutation}"/>
+        <apex:inputfield value="{!contact.birthdate}"/>
+        <apex:commandButton action="{!save}" value="Save"/>
+      </apex:pageBlockSection>
+    </apex:pageBlock>
   </apex:form>
-
 </apex:page>
\ No newline at end of file
diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page
index 966014a..38da2fc 100644
--- a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page
@@ -1,14 +1,11 @@
 <apex:page standardController="Contact">
-
-  <apex:sectionHeader title="{!contact.firstname}" subtitle="{!contact.account.name}"/>
-
+  <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
   <apex:pageBlock title="Contact">
     <apex:pageBlockSection title="Details">
-       <apex:outputfield value="{!contact.firstname}"/>
-       <apex:outputfield value="{!contact.lastname}"/>
-       <apex:outputfield value="{!contact.salutation}"/>
-       <apex:outputfield value="{!contact.birthdate}"/>
+      <apex:outputfield value="{!contact.firstname}"/>
+      <apex:outputfield value="{!contact.lastname}"/>
+      <apex:outputfield value="{!contact.salutation}"/>
+      <apex:outputfield value="{!contact.birthdate}"/>
     </apex:pageBlockSection>
   </apex:pageBlock>
-
 </apex:page>
\ No newline at end of file
diff --git a/spec/beautify-languages-spec.coffee b/spec/beautify-languages-spec.coffee
index 6cd1a7e..c20c1a6 100644
--- a/spec/beautify-languages-spec.coffee
+++ b/spec/beautify-languages-spec.coffee
@@ -152,6 +152,7 @@ describe "BeautifyLanguages", ->
 
                         beautifyCompleted = false
                         completionFun = (text) ->
+                          console.log(text, expectedContents)
                         #   logger.verbose(expectedTestPath, text) if ext is ".less"
                           expect(text instanceof Error).not.toEqual(true, text)
                           return beautifyCompleted = true if text instanceof Error
@@ -162,7 +163,7 @@ describe "BeautifyLanguages", ->
                           return beautifyCompleted = true if text is null
 
                           expect(typeof text).toEqual("string", "Text: #{text}")
-                          return beautifyCompleted = true if typeof text is "string"
+                          return beautifyCompleted = true if typeof text isnt "string"
                           # Check for beautification errors
                           if text isnt expectedContents
                             #   console.warn(allOptions, text, expectedContents)