fix: login setup process is now reset on client resize

- added a login test

Author: Torwent

osrs/interfaces/login.simba

@@ -144,10 +144,10 @@ begin
   Self.CancelButton.X2 := Self.Bounds.X2 - 8;
   Self.CancelButton.Y2 := Self.Bounds.Y1 + 19;
 
-  Self.OpenButton.X1 := Self.Bounds.X1 + 14;
-  Self.OpenButton.Y1 := Self.Bounds.Y2 - 34;
-  Self.OpenButton.X2 := Self.OpenButton.X1 + 79;
-  Self.OpenButton.Y2 := Self.OpenButton.Y1 + 23;
+  Self.OpenButton.X1 := Self.Bounds.X1 + 10;
+  Self.OpenButton.Y1 := Self.Bounds.Y2 - 38;
+  Self.OpenButton.X2 := Self.OpenButton.X1 + 89;
+  Self.OpenButton.Y2 := Self.OpenButton.Y1 + 32;
 
   Self.WorldBoxes := TBoxArray.Create(Self.Bounds.TopLeft.Offset(62, 35), 7, 24, 84, 18, [9, 1]);
 end;
@@ -443,7 +443,7 @@ Constant of all the login messages the login screen can handle.
     'Invalid credentials',
     'Incorrect username or password',
     'You need a skill total of',
-    'Please enter your username/email',
+    'your username/email',
     'Error connecting to server',
     'Your account has not logged out',
     'Login server offline',
@@ -551,6 +551,7 @@ begin
 
   with Self.Buttons[ERSLoginButton.EXISTING_USER] do
   begin
+    Bold := True;
     Bounds.X1 := Self.Bounds.X1 + 188;
     Bounds.Y1 := Self.Bounds.Y1 + 103;
     Bounds.X2 := Bounds.X1 + 134;
@@ -560,6 +561,7 @@ begin
 
   with Self.Buttons[ERSLoginButton.LOGIN] do
   begin
+    Bold := True;
     Bounds.X1 := Self.Bounds.X1 + 28;
     Bounds.Y1 := Self.Bounds.Y1 + 133;
     Bounds.X2 := Bounds.X1 + 134;
@@ -744,7 +746,7 @@ begin
   if dialog = '' then Exit;
 
   for msg := ERSLoginMessage.WELCOME to High(ERSLoginMessage)-1 do
-    if dialog.Contains(LOGIN_MESSAGES[Result-1]) then
+    if dialog.Contains(LOGIN_MESSAGES[msg-1]) then
       Exit(msg);
 end;
 
@@ -1017,8 +1019,3 @@ end;
 
 var
   Login: TRSLogin;
-begin
-  LoginWorldSwitcher.Setup();
-  Lobby.Setup();
-  Login.Setup();
-end;

osrs/interfaces/setup.simba

@@ -44,6 +44,10 @@ end;
 {$H-}
 procedure TargetResized(var sender: TTarget; data: TTargetEventData);
 begin
+  LoginWorldSwitcher.Setup();
+  Lobby.Setup();
+  Login.Setup();
+
   if RSClient.Mode = ERSMode.UNKNOWN then Exit;
   SetupInterfaces();
 end;

tests/002.simba

@@ -0,0 +1,80 @@
+(*
+## Login Tests
+Tests the integrety of several login methods.
+*)
+{$I SRLT/osrs.simba}
+{$ASSERTIONS ON}
+
+const
+  PATH: String = {$MACRO DIR} + 'imgs' + PATH_SEP;
+  MODES: TStringArray = ['fixed', 'resizable_classic'];
+  FILENAME: String := PATH_SEP + PathExtractNameWithoutExt(SCRIPT_FILE);
+var
+  mode: String;
+  img: TImage;
+begin
+  for mode in modes do
+  begin
+    if not FileExists(PATH + mode + FILENAME + '-0.png') then Continue;
+    img := TImage.Create(PATH + mode + FILENAME + '-0.png');
+    Target.SetImage(img);
+
+    RSClient.Mode := RSClient.DetectMode();
+    SetupInterfaces();
+
+    Assert(RSClient.IsLoggedIn() = False);
+    Assert(Login.GetMessage() = ERSLoginMessage.WELCOME);
+    Assert(Login.FindButton(ERSLoginButton.EXISTING_USER));
+    Assert(Login.GetMode() = ERSLoginMode.LEGACY);
+    Assert(LoginWorldSwitcher.IsOpen() = False);
+    Assert(LoginWorldSwitcher.GetCurrent() = 333);
+    Assert(Lobby.IsOpen() = False);
+
+    img.Free();
+    img := TImage.Create(PATH + mode + FILENAME + '-1.png');
+    Target.SetImage(img);
+
+    Assert(RSClient.IsLoggedIn() = False);
+    Assert(Login.GetMessage() = ERSLoginMessage.ENTER_CREDENTIALS);
+    Assert(Login.ClearInput(ERSLoginInput.USERNAME));
+    Assert(Login.ClearInput(ERSLoginInput.PASSWORD));
+    Assert(Login.FindButton(ERSLoginButton.LOGIN));
+
+    img.Free();
+    img := TImage.Create(PATH + mode + FILENAME + '-2.png');
+    Target.SetImage(img);
+
+    Assert(RSClient.IsLoggedIn() = False);
+    Assert(Login.GetMessage() = ERSLoginMessage.CONNECTING);
+    Assert(Login.InputIsFilled(ERSLoginInput.USERNAME));
+    Assert(Login.InputIsFilled(ERSLoginInput.PASSWORD));
+
+    img.Free();
+    img := TImage.Create(PATH + mode + FILENAME + '-3.png');
+    Target.SetImage(img);
+
+    Assert(RSClient.IsLoggedIn() = False);
+    Assert(Login.GetMessage() = ERSLoginMessage.INCORRECT);
+    Assert(Login.FindButton(ERSLoginButton.RETRY));
+
+    img.Free();
+    img := TImage.Create(PATH + mode + FILENAME + '-4.png');
+    Target.SetImage(img);
+
+    Assert(RSClient.IsLoggedIn() = False);
+    Assert(Lobby.IsOpen());
+
+    img.Free();
+    img := TImage.Create(PATH + mode + FILENAME + '-5.png');
+    Target.SetImage(img);
+
+    Assert(RSClient.IsLoggedIn() = False);
+    Assert(LoginWorldSwitcher.IsOpen());
+    Assert(LoginWorldSwitcher.Read(0) = 301);
+    Assert(LoginWorldSwitcher.Read(10) = 375);
+    Assert(LoginWorldSwitcher.Read(40) = 440);
+    Assert(Lobby.IsOpen() = False);
+
+    img.Free();
+  end;
+end;