Skip to content

Commit f6e3971

Browse files
committed
Run specs on Ruby 2.7
This fixes errors around using multiple assigns in conditions.
1 parent 2fe90de commit f6e3971

File tree

4 files changed

+67
-36
lines changed

4 files changed

+67
-36
lines changed

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.7.0

Gemfile.lock

+61-34
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,91 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
aruba (0.14.11)
5-
childprocess (>= 0.6.3, < 3.0.0)
6-
contracts (~> 0.9)
7-
cucumber (>= 1.3.19)
4+
activesupport (6.0.3.1)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
6+
i18n (>= 0.7, < 2)
7+
minitest (~> 5.1)
8+
tzinfo (~> 1.1)
9+
zeitwerk (~> 2.2, >= 2.2.2)
10+
aruba (1.0.1)
11+
childprocess (~> 3.0)
12+
contracts (~> 0.16.0)
13+
cucumber (>= 2.4, < 5.0)
814
ffi (~> 1.9)
9-
rspec-expectations (>= 2.99)
10-
thor (~> 0.19)
11-
backports (3.15.0)
12-
builder (3.2.3)
13-
childprocess (2.0.0)
14-
rake (< 13.0)
15+
rspec-expectations (~> 3.4)
16+
thor (~> 1.0)
17+
builder (3.2.4)
18+
childprocess (3.0.0)
1519
colored (1.2)
1620
command_line_reporter (3.3.6)
1721
colored (>= 1.2)
22+
concurrent-ruby (1.1.6)
1823
contracts (0.16.0)
19-
cucumber (3.1.2)
20-
builder (>= 2.1.2)
21-
cucumber-core (~> 3.2.0)
22-
cucumber-expressions (~> 6.0.1)
23-
cucumber-wire (~> 0.0.1)
24-
diff-lcs (~> 1.3)
25-
gherkin (~> 5.1.0)
26-
multi_json (>= 1.7.5, < 2.0)
27-
multi_test (>= 0.1.2)
28-
cucumber-core (3.2.1)
29-
backports (>= 3.8.0)
30-
cucumber-tag_expressions (~> 1.1.0)
31-
gherkin (~> 5.0)
32-
cucumber-expressions (6.0.1)
33-
cucumber-tag_expressions (1.1.1)
34-
cucumber-wire (0.0.1)
24+
cucumber (4.0.0)
25+
builder (~> 3.2, >= 3.2.3)
26+
cucumber-core (~> 7.0, >= 7.0.0)
27+
cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
28+
cucumber-gherkin (~> 13.0, >= 13.0.0)
29+
cucumber-html-formatter (~> 6.0, >= 6.0.1)
30+
cucumber-messages (~> 12.1, >= 12.1.1)
31+
cucumber-wire (~> 3.0, >= 3.0.0)
32+
diff-lcs (~> 1.3, >= 1.3)
33+
multi_test (~> 0.1, >= 0.1.2)
34+
sys-uname (~> 1.0, >= 1.0.2)
35+
cucumber-core (7.0.0)
36+
cucumber-gherkin (~> 13.0, >= 13.0.0)
37+
cucumber-messages (~> 12.1, >= 12.1.1)
38+
cucumber-tag-expressions (~> 2.0, >= 2.0.4)
39+
cucumber-cucumber-expressions (10.2.0)
40+
cucumber-gherkin (13.0.0)
41+
cucumber-messages (~> 12.0, >= 12.0.0)
42+
cucumber-html-formatter (6.0.2)
43+
cucumber-messages (~> 12.1, >= 12.1.1)
44+
cucumber-messages (12.1.1)
45+
protobuf-cucumber (~> 3.10, >= 3.10.8)
46+
cucumber-tag-expressions (2.0.4)
47+
cucumber-wire (3.0.0)
48+
cucumber-core (~> 7.0, >= 7.0.0)
49+
cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
50+
cucumber-messages (~> 12.1, >= 12.1.1)
3551
diff-lcs (1.3)
3652
diffy (3.3.0)
3753
fakefs (1.2.2)
38-
ffi (1.11.1)
39-
gherkin (5.1.0)
54+
ffi (1.13.0)
4055
hrx (1.0.0)
4156
linked-list (~> 0.0.13)
57+
i18n (1.8.3)
58+
concurrent-ruby (~> 1.0)
4259
linked-list (0.0.13)
60+
middleware (0.1.0)
4361
minitest (5.11.3)
44-
multi_json (1.13.1)
4562
multi_test (0.1.2)
46-
rake (12.3.3)
63+
protobuf-cucumber (3.10.8)
64+
activesupport (>= 3.2)
65+
middleware
66+
thor
67+
thread_safe
4768
rspec (3.8.0)
4869
rspec-core (~> 3.8.0)
4970
rspec-expectations (~> 3.8.0)
5071
rspec-mocks (~> 3.8.0)
5172
rspec-core (3.8.2)
5273
rspec-support (~> 3.8.0)
53-
rspec-expectations (3.8.4)
74+
rspec-expectations (3.8.6)
5475
diff-lcs (>= 1.2.0, < 2.0)
5576
rspec-support (~> 3.8.0)
5677
rspec-mocks (3.8.1)
5778
diff-lcs (>= 1.2.0, < 2.0)
5879
rspec-support (~> 3.8.0)
59-
rspec-support (3.8.2)
80+
rspec-support (3.8.3)
6081
ruby-terminfo (0.1.1)
61-
thor (0.20.3)
82+
sys-uname (1.2.1)
83+
ffi (>= 1.0.0)
84+
thor (1.0.1)
85+
thread_safe (0.3.6)
86+
tzinfo (1.2.7)
87+
thread_safe (~> 0.1)
88+
zeitwerk (2.3.0)
6289

6390
PLATFORMS
6491
ruby
@@ -74,4 +101,4 @@ DEPENDENCIES
74101
ruby-terminfo (~> 0.1.1)
75102

76103
BUNDLED WITH
77-
2.0.2
104+
2.1.2

lib/sass_spec/directory.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def rename(old, new)
168168

169169
new_dir.archive.add(
170170
HRX::File.new(new_basename, old_file.content, comment: old_file.comment),
171-
new_dir == old_dir ? {after: old_file} : {})
171+
after: new_dir == old_dir ? old_file : nil)
172172
new_dir._write!
173173

174174
old_dir.delete(old_basename)

tests/spec_helper.rb

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
require 'rspec'
66
require 'aruba/rspec'
77

8+
Aruba.configure do |config|
9+
config.allow_absolute_paths = true
10+
end
11+
812
# Given the output of sass-spec,
913
# return the number of tests in
1014
# each state (success, failed, etc)

0 commit comments

Comments
 (0)