Make tests independent of exact button count

Author: pimterry

test/android/test.ts

@@ -159,7 +159,7 @@ describe('Test Android unpinning', function () {
 
         it("all requests should fail", async () => {
             const buttons = await driver.$$('android=new UiSelector().className("android.widget.Button")');
-            expect(buttons).to.have.lengthOf(13, 'Expected buttons were not present');
+            const buttonCount = await buttons.length;
 
             buttons.map(button => button.click());
             await Promise.all(await buttons.map(async (button) => {
@@ -170,7 +170,7 @@ describe('Test Android unpinning', function () {
             }));
 
             expect(seenRequests).to.have.lengthOf(0, 'Expected all requests to fail');
-            expect(tlsFailures).to.have.lengthOf(13, 'Expected TLS failures for all requests');
+            expect(tlsFailures).to.have.lengthOf(buttonCount, 'Expected TLS failures for all requests');
         });
 
     });
@@ -183,7 +183,6 @@ describe('Test Android unpinning', function () {
 
         it('all buttons should succeed initially', async () => {
             const buttons = await driver.$$('android=new UiSelector().className("android.widget.Button")');
-            expect(buttons).to.have.lengthOf(13, 'Expected buttons were not present');
 
             buttons.map(button => button.click());
             await Promise.all(await buttons.map(async (button) => {
@@ -213,7 +212,6 @@ describe('Test Android unpinning', function () {
 
         it("all unpinned requests should succeed, all others should fail", async () => {
             const buttons = await driver.$$('android=new UiSelector().className("android.widget.Button")');
-            expect(buttons).to.have.lengthOf(13, 'Expected buttons were not present');
 
             buttons.map(button => button.click());
             await Promise.all(await buttons.map(async (button) => {
@@ -249,7 +247,7 @@ describe('Test Android unpinning', function () {
 
         it("all buttons except 'Raw custom-pinned request' should succeed", async () => {
             const buttons = await driver.$$('android=new UiSelector().className("android.widget.Button")');
-            expect(buttons).to.have.lengthOf(13, 'Expected buttons were not present');
+            const buttonCount = await buttons.length;
 
             buttons.map(button => button.click());
             await Promise.all(await buttons.map(async (button) => {
@@ -259,7 +257,8 @@ describe('Test Android unpinning', function () {
                 }
             }));
 
-            expect(seenRequests).to.have.lengthOf(14, 'Expected all requests to be intercepted');
+            const reqCount = buttonCount + 1; // WebView makes a favicon request
+            expect(seenRequests).to.have.lengthOf(reqCount - 1, 'Expected all but one request to be intercepted');
             expect(tlsFailures).to.have.lengthOf(1, 'Expected only raw request to fail');
         });