scss-lint 0.33.0 → 0.34.0

data/spec/scss_lint/linter/zero_unit_spec.rb

@@ -2,111 +2,111 @@ require 'spec_helper'
 
 describe SCSSLint::Linter::ZeroUnit do
   context 'when no properties exist' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end
 
   context 'when properties with unit-less zeros exist' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         margin: 0;
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end
 
   context 'when properties with non-zero values exist' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         margin: 5px;
         line-height: 1.5em;
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end
 
   context 'when properties with zero values contain units' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         margin: 0px;
       }
-    CSS
+    SCSS
 
     it { should report_lint line: 2 }
   end
 
   context 'when properties with multiple zero values containing units exist' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         margin: 5em 0em 2em 0px;
       }
-    CSS
+    SCSS
 
     it { should report_lint line: 2, count: 2 }
   end
 
   context 'when function call contains a zero value with units' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         margin: some-function(0em);
       }
-    CSS
+    SCSS
 
     it { should report_lint line: 2 }
   end
 
   context 'when mixin include contains a zero value with units' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         @include some-mixin(0em);
       }
-    CSS
+    SCSS
 
     it { should report_lint line: 2 }
   end
 
   context 'when string contains a zero value with units' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         content: func("0em");
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end
 
   context 'when property value has a ".0" fractional component' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         margin: 4.0em;
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end
 
   context 'when property value has a color hex with a leading 0' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         color: #0af;
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end
 
   context 'when property with zero value is a dimension' do
-    let(:css) { <<-CSS }
+    let(:scss) { <<-SCSS }
       p {
         transition-delay: 0s;
       }
-    CSS
+    SCSS
 
     it { should_not report_lint }
   end

data/spec/scss_lint/linter_spec.rb

@@ -12,6 +12,11 @@ describe SCSSLint::Linter do
           add_lint(node, 'everything offends me')
         end
 
+        def visit_class(klass)
+          return unless klass.to_s == '.badClass'
+          add_lint(klass, 'a bad class was used')
+        end
+
         # Bypasses the visit order so a control comment might not be reached before a lint is
         # added
         def visit_rule(node)
@@ -28,7 +33,7 @@ describe SCSSLint::Linter do
     end
 
     context 'when a disable is not present' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p {
           border: fail1;
 
@@ -36,13 +41,13 @@ describe SCSSLint::Linter do
             border: fail1;
           }
         }
-      CSS
+      SCSS
 
       it { should report_lint }
     end
 
     context 'when a disable is present at the top level' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Fake
         p {
           border: fail1;
@@ -51,13 +56,13 @@ describe SCSSLint::Linter do
             border: fail1;
           }
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when a disable is present at the top level for another linter' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Bogus
         p {
           border: fail1;
@@ -65,13 +70,13 @@ describe SCSSLint::Linter do
         p {
           border: bogus;
         }
-      CSS
+      SCSS
 
       it { should report_lint lint: 3 }
     end
 
     context 'when a linter is disabled then enabled again' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Fake
         p {
           border: fail1;
@@ -80,14 +85,14 @@ describe SCSSLint::Linter do
         p {
           border: fail1;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint line: 3 }
       it { should report_lint line: 7 }
     end
 
     context 'when a linter is disabled within a rule' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p {
           // scss-lint:disable Fake
           border: fail1;
@@ -100,7 +105,7 @@ describe SCSSLint::Linter do
         p {
           border: fail1;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint line: 3 }
       it { should_not report_lint line: 6 }
@@ -108,7 +113,7 @@ describe SCSSLint::Linter do
     end
 
     context 'when more than one linter is disabled' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Bogus, Fake
         p {
           border: fail1;
@@ -117,13 +122,13 @@ describe SCSSLint::Linter do
         p {
           border: bogus;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when more than one linter is disabled without spaces between the linter names' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Fake,Bogus
         p {
           border: fail1;
@@ -132,13 +137,13 @@ describe SCSSLint::Linter do
         p {
           border: Bogus;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when more than one linter is disabled without commas between the linter names' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Fake Bogus
         p {
           border: fail1;
@@ -147,13 +152,13 @@ describe SCSSLint::Linter do
         p {
           border: bogus;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when two linters are disabled and only one is reenabled' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable Fake, Bogus
         p {
           border: fail1;
@@ -164,14 +169,14 @@ describe SCSSLint::Linter do
           margin: fail1;
           border: bogus;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint line: 3 }
       it { should report_lint line: 8 }
     end
 
     context 'when all linters are disabled' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable all
         p {
           border: fail1;
@@ -181,13 +186,13 @@ describe SCSSLint::Linter do
           margin: fail1;
           border: bogus;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when all linters are disabled and then one is re-enabled' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         // scss-lint:disable all
         p {
           border: fail1;
@@ -198,25 +203,25 @@ describe SCSSLint::Linter do
           margin: fail1;
           border: bogus;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint line: 3 }
       it { should report_lint line: 8 }
     end
 
     context 'when a linter is bypassing the visit tree order' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p {
           // scss-lint:disable Fake
           border: fail2;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when the command comment is next to other comments' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p {
           // scss-lint:disable Fake
           // more comments
@@ -228,21 +233,60 @@ describe SCSSLint::Linter do
           // scss-lint:disable Fake
           border: fail2;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint }
     end
 
     context 'when the command comment is at the end of a statement' do
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p {
           border: fail1; // scss-lint:disable Fake
           border: fail1;
         }
-      CSS
+      SCSS
 
       it { should_not report_lint line: 2 }
       it { should report_lint line: 3 }
     end
+
+    context 'when global disable comes before an @include' do
+      let(:scss) { <<-SCSS }
+        // scss-lint:disable Fake
+        p {
+          border: fail1;
+        }
+
+        @include mixin(param) {
+          border: fail1;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when // control comment appears in the middle of a comma sequence' do
+      let(:scss) { <<-SCSS }
+        .badClass, // scss-lint:disable Fake
+        .good-selector {
+          border: fail1;
+        }
+      SCSS
+
+      it { should_not report_lint line: 1 }
+      it { should report_lint line: 3 }
+    end
+
+    context 'when /* control comment appears in the middle of a comma sequence' do
+      let(:scss) { <<-SCSS }
+        .badClass, /* scss-lint:disable Fake */
+        .good-selector {
+          border: fail1;
+        }
+      SCSS
+
+      it { should_not report_lint line: 1 }
+      it { should report_lint line: 3 }
+    end
   end
 end

data/spec/scss_lint/runner_spec.rb

@@ -17,7 +17,6 @@ describe SCSSLint::Runner do
     SCSSLint::LinterRegistry.stub(:linters)
                             .and_return([SCSSLint::Linter::FakeLinter1,
                                          SCSSLint::Linter::FakeLinter2])
-    SCSSLint::Config.stub(:for_file)
   end
 
   class SCSSLint::Linter::FakeLinter1 < SCSSLint::Linter; end

data/spec/scss_lint/selector_visitor_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe SCSSLint::SelectorVisitor do
   describe '#visit' do
-    let(:engine) { SCSSLint::Engine.new(css) }
+    let(:engine) { SCSSLint::Engine.new(scss) }
     before { RuleVisitor.new(visitor).run(engine) }
 
     # Visits every rule in the given parse tree and passes the parsed selector
@@ -42,11 +42,11 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestAttributeVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         [rel="nofollow"] {}
         a[href="http"] {}
         .class [data-count] {}
-      CSS
+      SCSS
 
       it 'visits all attribute nodes' do
         visitor.node_order.should == %w[rel href data-count]
@@ -62,11 +62,11 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestClassVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         a.link {}
         .menu .menu-item {}
         .button[data-source], .overlay {}
-      CSS
+      SCSS
 
       it 'visits all class nodes' do
         visitor.node_order.should == %w[link menu menu-item button overlay]
@@ -82,11 +82,11 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestElementVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         a, b {}
         .class {}
         i + p {}
-      CSS
+      SCSS
 
       it 'visits all element nodes' do
         visitor.node_order.should == %w[a b i p]
@@ -102,10 +102,10 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestIdVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         #something, #thing {}
         #object + #entity {}
-      CSS
+      SCSS
 
       it 'visits all id nodes' do
         visitor.node_order.should == %w[something thing object entity]
@@ -121,13 +121,13 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestParentVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p {
           &.class {}
           .container & {}
           .nothing {}
         }
-      CSS
+      SCSS
 
       it 'visits all parent nodes' do
         visitor.node_order.should == [2, 3]
@@ -143,10 +143,10 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestPlaceholderVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         %placeholder, %other-placeholder {}
         .button, %button {}
-      CSS
+      SCSS
 
       it 'visits all placeholder nodes' do
         visitor.node_order.should == %w[placeholder other-placeholder button]
@@ -162,12 +162,12 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestPseudoVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         li:first-child, li:last-child {}
         p {
           &:first-letter {}
         }
-      CSS
+      SCSS
 
       it 'visits all pseudo-selector nodes' do
         visitor.node_order.should == %w[first-child last-child first-letter]
@@ -183,12 +183,12 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestUniversalVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         p > * {}
         * {}
         li {}
         *:first-child {}
-      CSS
+      SCSS
 
       it 'visits all universal-selector nodes' do
         visitor.node_order.should == [1, 2, 4]
@@ -204,13 +204,13 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestSimpleSequenceVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         a, b, p[lang] {}
         a.link + b.word {}
         li {}
         ul > li {}
         p span {}
-      CSS
+      SCSS
 
       it 'visits all simple sequences' do
         visitor.node_order.count.should == 10
@@ -226,13 +226,13 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestSequenceVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         a, b, p[lang] {}
         a.link + b.word {}
         li {}
         ul > li {}
         p span {}
-      CSS
+      SCSS
 
       it 'visits all sequences' do
         visitor.node_order.count.should == 7
@@ -248,13 +248,13 @@ describe SCSSLint::SelectorVisitor do
 
       let(:visitor) { TestCommaSequenceVisitor.new }
 
-      let(:css) { <<-CSS }
+      let(:scss) { <<-SCSS }
         a, b, p[lang] {}
         a.link + b.word {}
         li {}
         ul > li {}
         p span {}
-      CSS
+      SCSS
 
       it 'visits all comma (i.e. selector) sequences' do
         visitor.node_order.count.should == 5