@@ -63,41 +63,30 @@ namespace :test do
63
63
64
64
desc "Run sass-spec tests against the local code."
65
65
task :spec do
66
- require "yaml"
67
- sass_spec_options = YAML . load_file ( scope ( "test/sass-spec.yml" ) )
68
- enabled = sass_spec_options . delete ( :enabled )
69
- unless enabled
70
- puts "SassSpec tests are disabled."
71
- next
72
- end
73
- if ruby_version_at_least? ( "1.9.2" )
74
- old_load_path = $:. dup
66
+ old_load_path = $:. dup
67
+ begin
68
+ $:. unshift ( File . join ( File . dirname ( __FILE__ ) , "lib" ) )
75
69
begin
76
- $:. unshift ( File . join ( File . dirname ( __FILE__ ) , "lib" ) )
77
- begin
78
- require 'sass_spec'
79
- rescue LoadError
80
- puts "You probably forgot to run: bundle exec rake"
81
- raise
82
- end
83
- default_options = {
84
- :spec_directory => SassSpec ::SPEC_DIR ,
85
- :engine_adapter => SassEngineAdapter . new ,
86
- :generate => false ,
87
- :tap => false ,
88
- :skip => false ,
89
- :verbose => false ,
90
- :filter => "" ,
91
- :limit => -1 ,
92
- :unexpected_pass => false ,
93
- :nuke => false ,
94
- }
95
- SassSpec ::Runner . new ( default_options . merge ( sass_spec_options ) ) . run || exit ( 1 )
96
- ensure
97
- $:. replace ( old_load_path )
70
+ require 'sass_spec'
71
+ rescue LoadError
72
+ puts "You probably forgot to run: bundle exec rake"
73
+ raise
98
74
end
99
- else
100
- "Skipping sass-spec on ruby versions less than 1.9.2"
75
+ SassSpec ::Runner . new (
76
+ language_version : get_version [ /^\d +\. \d +/ ] ,
77
+ spec_directory : SassSpec ::SPEC_DIR ,
78
+ engine_adapter : SassEngineAdapter . new ,
79
+ generate : false ,
80
+ tap : false ,
81
+ skip : false ,
82
+ verbose : false ,
83
+ filter : "" ,
84
+ limit : -1 ,
85
+ unexpected_pass : false ,
86
+ nuke : false ,
87
+ ) . run || exit ( 1 )
88
+ ensure
89
+ $:. replace ( old_load_path )
101
90
end
102
91
end
103
92
end
0 commit comments