Skip to content

Commit 31e90c0

Browse files
author
Landon Wilkins
committed
allow jsx tests for coffee changes, fixes SD-1261
test plan: * test commit Change-Id: I9e3da787a56467c886d1e70f107b3abb916c6d1e Reviewed-on: https://gerrit.instructure.com/82842 Reviewed-by: Jon Jensen <jon@instructure.com> Product-Review: Jon Jensen <jon@instructure.com> QA-Review: Jon Jensen <jon@instructure.com> Tested-by: Jenkins
1 parent 0e46247 commit 31e90c0

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

gems/tatl_tael/lib/tatl_tael/linter.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,12 @@ def needs_coffee_specs?
8484
end
8585

8686
COFFEE_SPEC_REGEX = /spec\/coffeescripts\//
87+
JSX_SPEC_REGEX = /spec\/(coffeescripts|javascripts)\/jsx\//
8788
def coffee_specs?
8889
changes.any? do |change|
8990
!change.deleted? &&
90-
change.path =~ COFFEE_SPEC_REGEX
91+
(change.path =~ COFFEE_SPEC_REGEX ||
92+
change.path =~ JSX_SPEC_REGEX)
9193
end
9294
end
9395

@@ -99,7 +101,6 @@ def needs_jsx_specs?
99101
end
100102
end
101103

102-
JSX_SPEC_REGEX = /spec\/(coffeescripts|javascripts)\/jsx\//
103104
def jsx_specs?
104105
changes.any? do |change|
105106
!change.deleted? &&

gems/tatl_tael/spec/linter_spec.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@
7979
[{ path: APP_COFFEE_BUNDLE_PATH, deleted?: false }],
8080
:ensure_coffee_specs
8181
end
82+
83+
context "with jsx spec changes" do
84+
include_examples "change combos",
85+
APP_COFFEE_PATH,
86+
JSX_SPEC_PATH,
87+
:ensure_coffee_specs
88+
end
8289
end
8390
end
8491

script/tatl_tael

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ end
6464

6565
linter.ensure_coffee_specs do
6666
errors << "Your commit includes coffee changes,"\
67-
" but does not include coffee specs."\
67+
" but does not include coffee or jsx specs."\
6868
" Please add some to verify your changes."
6969
end
7070

0 commit comments

Comments
 (0)