Permalink
Browse files

fix test names and remove unnecessary comments

  • Loading branch information...
1 parent 84546ce commit df3507ce66b96f9b7981bd8d7fdacfccc6b288f6 @tenderlove tenderlove committed with nex3 Mar 22, 2013
Showing with 10 additions and 19 deletions.
  1. +0 −1 lib/sass/tree/rule_node.rb
  2. +7 −9 lib/sass/util.rb
  3. +0 −4 lib/sass/version.rb
  4. +2 −2 test/sass/extend_test.rb
  5. +1 −1 test/sass/scss/css_test.rb
  6. +0 −2 test/test_helper.rb
@@ -1,5 +1,4 @@
require 'pathname'
-require 'uri'
module Sass::Tree
# A static node reprenting a CSS rule.
View
@@ -3,6 +3,7 @@
require 'enumerator'
require 'stringio'
require 'rbconfig'
+require 'uri'
require 'sass/root'
require 'sass/util/subset_map'
@@ -963,15 +964,12 @@ def method_missing(name, *args, &block)
end
- # This is a hack around the fact that you can't instantiate a URI parser
- # on 1.8, so we have to have this hacky stuff to work around it. When
- # 1.8 support is dropped, we can remove this method.
- #
- # **THIS IS NOT A PUBLIC METHOD, JUST A HACK** :-)
- def escape_uri(uri) # :nodoc:
- URI.const_defined?(:DEFAULT_PARSER) ?
- URI::DEFAULT_PARSER.escape(uri) :
- URI.escape(uri)
+ URI_ESCAPE = URI.const_defined?(:DEFAULT_PARSER) ?
+ URI::DEFAULT_PARSER :
+ URI
+
+ def escape_uri(uri)
+ URI_ESCAPE.escape uri
end
private
View
@@ -1,8 +1,4 @@
require 'date'
-
-# This is necessary for loading Sass when Haml is required in Rails 3.
-# Once the split is complete, we can remove it.
-require File.dirname(__FILE__) + '/../sass' unless defined?(SASS_BEGUN_TO_LOAD)
require 'sass/util'
module Sass
View
@@ -458,7 +458,7 @@ def test_nested_extender_doesnt_find_common_selectors_around_reference_selector
assert_extends 'a /for/ b c .c1', 'b c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b c .c2'
end
- def test_nested_extender_with_early_child_selectors_doesnt_subseq_them_XXX
+ def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
assert_extends('.bip > .bap .foo', '.grip > .bap .bar {@extend .foo}',
'.bip > .bap .foo, .bip > .bap .grip > .bap .bar, .grip > .bap .bip > .bap .bar')
assert_extends('.bap > .bip .foo', '.bap > .grip .bar {@extend .foo}',
@@ -489,7 +489,7 @@ def test_nested_extender_with_child_selector_unifies
SCSS
end
- def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
+ def test_nested_extender_with_early_child_selector
assert_equal <<CSS, render(<<SCSS)
.foo .bar, .foo .bip > .baz {
a: b; }
@@ -651,7 +651,7 @@ def test_supports
## Selectors
# Taken from http://dev.w3.org/csswg/selectors4/#overview
- def test_summarized_selectors_XXX
+ def test_summarized_selectors_with_element
assert_selector_parses('*')
assert_selector_parses('E')
assert_selector_parses('E:not(s)')
View
@@ -10,8 +10,6 @@
if defined?(Encoding)
$-w, w = false, $-w
- # this seems suspect. Does sass require that users run in environments with
- # UTF-8 as the encoding?
Encoding.default_external = 'UTF-8'
$-w = w
end

0 comments on commit df3507c

Please sign in to comment.