@@ -355,53 +355,6 @@ def test_resolved_in_next_release_non_semver(self):
355
355
assert group_resolution .status == GroupResolution .Status .pending
356
356
assert group_resolution .release .version == most_recent_version .version
357
357
358
- # XXX: Remove this test once the feature flag is removed
359
- def test_resolved_in_next_release_semver_no_flag_and_first_release (self ):
360
- self .login_as (user = self .user )
361
- project = self .create_project_with_releases ()
362
- first_release = Release .get_or_create (version = "com.foo.bar@1.0+0" , project = project )
363
- Release .get_or_create (version = "com.foo.bar@2.0+0" , project = project )
364
- wrong_release = Release .get_or_create (version = "com.foo.bar@1.0+1" , project = project )
365
- # Using store_event() instead of create_group() produces GroupRelease objects
366
- # which is considered during the update_groups() call
367
- event = self .store_event (data = {"release" : first_release .version }, project_id = project .id )
368
- group = event .group
369
- assert group is not None
370
- assert group .status == GroupStatus .UNRESOLVED
371
- assert group .substatus == GroupSubStatus .NEW
372
- assert group .first_release == first_release
373
- assert GroupResolution .objects .all ().count () == 0
374
-
375
- url = f"/api/0/issues/{ group .id } /"
376
- data = {"status" : "resolvedInNextRelease" }
377
- response = self .client .put (url , data = data )
378
- assert response .status_code == 200 , response .content == {}
379
-
380
- # Refetch from DB to ensure the latest state is fetched
381
- group = Group .objects .get (id = group .id , project = project .id )
382
- assert group .status == GroupStatus .RESOLVED
383
-
384
- group_resolution = GroupResolution .objects .filter (group = group ).first ()
385
- assert group_resolution is not None
386
- assert group_resolution .group == group
387
- # For semver projects, we consider resolution based on an expression rather than a specific release,
388
- # thus, it is considered resolved in the release that has the highest semver
389
- assert group_resolution .type == GroupResolution .Type .in_release
390
- assert group_resolution .status == GroupResolution .Status .resolved
391
- assert group_resolution .release .version == wrong_release .version
392
- assert response .data ["statusDetails" ]["inRelease" ] == wrong_release .version
393
-
394
- # Let's test that it does not regress to the first release
395
- event = self .store_event (data = {"release" : first_release .version }, project_id = project .id )
396
- group = Group .objects .get (id = group .id , project = project .id )
397
- assert group .status == GroupStatus .RESOLVED
398
-
399
- # Let's test that it does regress - this is fixed with the feature flag
400
- event = self .store_event (data = {"release" : wrong_release .version }, project_id = project .id )
401
- group = Group .objects .get (id = group .id , project = project .id )
402
- assert group .status == GroupStatus .UNRESOLVED
403
- assert group .substatus == GroupSubStatus .REGRESSED
404
-
405
358
def create_project_with_releases (self ) -> Project :
406
359
project = self .create_project ()
407
360
project .flags .has_releases = True
@@ -482,12 +435,10 @@ def resolved_in_next_release_helper(self, with_first_release: bool = True) -> No
482
435
assert group .status == GroupStatus .UNRESOLVED
483
436
assert group .substatus == GroupSubStatus .REGRESSED
484
437
485
- @with_feature ("organizations:releases-resolve-next-release-semver-fix" )
486
- def test_resolved_in_next_release_semver_with_flag_no_first_release (self ):
438
+ def test_resolved_in_next_release_semver_no_first_release (self ):
487
439
self .resolved_in_next_release_helper (with_first_release = False )
488
440
489
- @with_feature ("organizations:releases-resolve-next-release-semver-fix" )
490
- def test_resolved_in_next_release_semver_with_flag_and_first_release (self ):
441
+ def test_resolved_in_next_release_semver_and_first_release (self ):
491
442
self .resolved_in_next_release_helper (with_first_release = True )
492
443
493
444
def test_resolved_in_next_release_no_release (self ):
@@ -499,23 +450,6 @@ def test_resolved_in_next_release_no_release(self):
499
450
response = self .client .put (url , data = {"status" : "resolvedInNextRelease" })
500
451
assert response .status_code == 200 , response .content
501
452
502
- group = Group .objects .get (id = group .id , project = group .project .id )
503
- assert group .status == GroupStatus .RESOLVED
504
-
505
- # no GroupResolution because there is no release
506
- assert not GroupResolution .objects .filter (group = group ).exists ()
507
- assert response .data ["statusDetails" ] == {}
508
-
509
- @with_feature ("organizations:releases-resolve-next-release-semver-fix" )
510
- def test_resolved_in_next_release_with_flag_no_release (self ):
511
- self .login_as (user = self .user )
512
- project = self .create_project_with_releases ()
513
- group = self .create_group_with_no_release (project )
514
-
515
- url = f"/api/0/organizations/{ group .organization .slug } /issues/{ group .id } /"
516
- response = self .client .put (url , data = {"status" : "resolvedInNextRelease" })
517
- assert response .status_code == 200 , response .content
518
-
519
453
# Refetch from DB to ensure the latest state is fetched
520
454
group = Group .objects .get (id = group .id , project = group .project .id )
521
455
assert group .status == GroupStatus .RESOLVED
0 commit comments