🔧 Refactor: Update status order and test cases

Modify status order to reflect new workflow and update
corresponding test cases. Remove 'In Progress' and 'Stalled'
statuses, adjust order of 'Blocked', 'Wontfix', 'Invalid',
'Duplicate', and 'Resolved' statuses. Update test assertions
to match new status order and workflow.

Author: Timpan4

phabfive/status_transitions.py

@@ -14,14 +14,11 @@
 # Statuses like "Wontfix", "Invalid", "Duplicate" are considered terminal/closed states
 STATUS_ORDER = {
     "open": 0,
-    "in progress": 1,
-    "stalled": 2,
-    "resolved": 3,
-    "closed": 4,
-    "wontfix": 5,
-    "invalid": 6,
-    "duplicate": 7,
-    "spite": 8,
+    "blocked": 1,
+    "wontfix": 2,
+    "invalid": 3,
+    "duplicate": 4,
+    "resolved": 5,
 }
 
 
@@ -80,7 +77,9 @@ def matches(self, status_transactions, current_status):
         """
         # All conditions must match for the pattern to match
         for condition in self.conditions:
-            if not self._matches_condition(condition, status_transactions, current_status):
+            if not self._matches_condition(
+                condition, status_transactions, current_status
+            ):
                 return False
         return True
 

tests/test_status_transitions.py

@@ -17,31 +17,25 @@ class TestGetStatusOrder:
     def test_open(self):
         assert get_status_order("Open") == 0
 
-    def test_in_progress(self):
-        assert get_status_order("In Progress") == 1
-
-    def test_stalled(self):
-        assert get_status_order("Stalled") == 2
-
-    def test_resolved(self):
-        assert get_status_order("Resolved") == 3
-
-    def test_closed(self):
-        assert get_status_order("Closed") == 4
+    def test_blocked(self):
+        assert get_status_order("Blocked") == 1
 
     def test_wontfix(self):
-        assert get_status_order("Wontfix") == 5
+        assert get_status_order("Wontfix") == 2
 
     def test_invalid(self):
-        assert get_status_order("Invalid") == 6
+        assert get_status_order("Invalid") == 3
 
     def test_duplicate(self):
-        assert get_status_order("Duplicate") == 7
+        assert get_status_order("Duplicate") == 4
+
+    def test_resolved(self):
+        assert get_status_order("Resolved") == 5
 
     def test_case_insensitive(self):
         assert get_status_order("OPEN") == 0
-        assert get_status_order("resolved") == 3
-        assert get_status_order("ClOsEd") == 4
+        assert get_status_order("blocked") == 1
+        assert get_status_order("ReSOlvEd") == 5
 
     def test_unknown_status(self):
         assert get_status_order("Unknown") is None
@@ -87,8 +81,8 @@ def test_parse_been(self):
         assert result == {"type": "been", "status": "Resolved"}
 
     def test_parse_never(self):
-        result = _parse_single_condition("never:Closed")
-        assert result == {"type": "never", "status": "Closed"}
+        result = _parse_single_condition("never:Resolved")
+        assert result == {"type": "never", "status": "Resolved"}
 
     def test_invalid_type(self):
         with pytest.raises(PhabfiveException) as exc:
@@ -120,8 +114,8 @@ def test_parse_not_in(self):
         assert result == {"type": "in", "status": "Open", "negated": True}
 
     def test_parse_not_from(self):
-        result = _parse_single_condition("not:from:Closed")
-        assert result == {"type": "from", "status": "Closed", "negated": True}
+        result = _parse_single_condition("not:from:Resolved")
+        assert result == {"type": "from", "status": "Resolved", "negated": True}
 
     def test_parse_not_from_with_direction(self):
         result = _parse_single_condition("not:from:Open:raised")
@@ -170,7 +164,7 @@ def test_and_conditions_plus(self):
         assert patterns[0].conditions[1] == {"type": "in", "status": "Resolved"}
 
     def test_complex_pattern(self):
-        patterns = parse_status_patterns("from:Open:raised+in:Resolved,to:Closed")
+        patterns = parse_status_patterns("from:Open:raised+in:Resolved,to:Wontfix")
         assert len(patterns) == 2
         # First pattern: AND conditions
         assert len(patterns[0].conditions) == 2
@@ -182,7 +176,7 @@ def test_complex_pattern(self):
         assert patterns[0].conditions[1] == {"type": "in", "status": "Resolved"}
         # Second pattern
         assert len(patterns[1].conditions) == 1
-        assert patterns[1].conditions[0] == {"type": "to", "status": "Closed"}
+        assert patterns[1].conditions[0] == {"type": "to", "status": "Wontfix"}
 
     def test_empty_pattern(self):
         with pytest.raises(PhabfiveException) as exc:
@@ -241,10 +235,10 @@ def test_matches_been_status(self):
         pattern = StatusPattern([{"type": "been", "status": "Open"}])
 
         transactions = [
-            {"oldValue": "Open", "newValue": "Resolved", "dateCreated": 1234567890},
-            {"oldValue": "Resolved", "newValue": "Closed", "dateCreated": 1234567900}
+            {"oldValue": "Open", "newValue": "Blocked", "dateCreated": 1234567890},
+            {"oldValue": "Blocked", "newValue": "Resolved", "dateCreated": 1234567900}
         ]
-        current_status = "Closed"
+        current_status = "Resolved"
 
         assert pattern.matches(transactions, current_status) is True
 
@@ -308,7 +302,7 @@ def test_matches_and_conditions_fail(self):
         """Test multiple AND conditions fail if any doesn't match"""
         pattern = StatusPattern([
             {"type": "been", "status": "Open"},
-            {"type": "in", "status": "Closed"}
+            {"type": "in", "status": "Wontfix"}
         ])
 
         transactions = [