Revert "Pause checks for GV1 migration when checking for capability downgrades."
This reverts commit e7745db36e
.
This commit is contained in:
parent
34a11c2338
commit
e551fd2c1b
|
@ -235,6 +235,10 @@ public class DeviceController {
|
||||||
private boolean isCapabilityDowngrade(Account account, DeviceCapabilities capabilities, String userAgent) {
|
private boolean isCapabilityDowngrade(Account account, DeviceCapabilities capabilities, String userAgent) {
|
||||||
boolean isDowngrade = false;
|
boolean isDowngrade = false;
|
||||||
|
|
||||||
|
if (account.isGv1MigrationSupported() && !capabilities.isGv1Migration()) {
|
||||||
|
isDowngrade = true;
|
||||||
|
}
|
||||||
|
|
||||||
if (account.isGroupsV2Supported()) {
|
if (account.isGroupsV2Supported()) {
|
||||||
try {
|
try {
|
||||||
switch (UserAgentUtil.parseUserAgentString(userAgent).getPlatform()) {
|
switch (UserAgentUtil.parseUserAgentString(userAgent).getPlatform()) {
|
||||||
|
|
|
@ -11,7 +11,6 @@ import junitparams.JUnitParamsRunner;
|
||||||
import junitparams.Parameters;
|
import junitparams.Parameters;
|
||||||
import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory;
|
import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
@ -261,7 +260,6 @@ public class DeviceControllerTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void deviceDowngradeGv1MigrationTest() {
|
public void deviceDowngradeGv1MigrationTest() {
|
||||||
Device.DeviceCapabilities deviceCapabilities = new Device.DeviceCapabilities(true, true, true, true, false, false);
|
Device.DeviceCapabilities deviceCapabilities = new Device.DeviceCapabilities(true, true, true, true, false, false);
|
||||||
AccountAttributes accountAttributes = new AccountAttributes("keykeykeykey", false, 1234, null, null, null, null, true, deviceCapabilities);
|
AccountAttributes accountAttributes = new AccountAttributes("keykeykeykey", false, 1234, null, null, null, null, true, deviceCapabilities);
|
||||||
|
|
Loading…
Reference in New Issue