Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Compile cow block properly #1524

Merged
merged 1 commit into from
Nov 17, 2023
+1 −8
Merged

fix: Compile cow block properly #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions game/end_to_end_tests/test_play_through.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import pytest

from .base_game_test import BaseGameTest


Expand Down Expand Up @@ -141,12 +139,9 @@ def test_level_036(self):
def test_level_037(self):
self._complete_level(37)

# TODO: Fix cow tests
@pytest.mark.skip(reason="Cow tests are broken")
def test_level_038(self):
self._complete_level(38)

@pytest.mark.skip(reason="Cow tests are broken")
def test_level_039(self):
self._complete_level(39, check_route_score=False)

Expand Down Expand Up @@ -174,8 +169,6 @@ def test_level_045(self):
def test_level_046(self):
self._complete_level(46)

# TODO: Fix cow tests
@pytest.mark.skip(reason="Cow tests are broken")
def test_level_047(self):
self._complete_level(47)

Expand Down
2 changes: 1 addition & 1 deletion game/static/game/js/blocklyCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ ocargo.BlocklyCompiler.prototype.getCondition = function (conditionBlock) {
);
} else if (conditionBlock.type === "traffic_light") {
return this.trafficLightCondition(conditionBlock);
} else if (conditionBlock.type === "declare_event") {
} else if (conditionBlock.type === "cow_crossing") {
return this.cowCrossingCondition(conditionBlock);
} else if (conditionBlock.type === "logic_compare") {
return this.logicCompareCondition(conditionBlock);
Expand Down