Merge pull request #235 from SimonStnn/bugfix/small-fixes

Small fixes
SimonStnn · Jun 18, 2024 · 8502e39 · 8502e39
2 parents 5cf0dc8 + 6e094c2
commit 8502e39
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/src/background/background.ts b/src/background/background.ts
@@ -109,18 +109,18 @@ const updateBadgeColors = () => {
 
   const spawnBalloon = async () => {
     log.groupCollapsed(
-      'info',
+      'debug',
       `(${new Date().toLocaleTimeString()}) Spawning Balloon...`
     );
-    log.time('info', 'Spawn Time');
+    log.time('debug', 'Spawn Time');
 
     const now = Date.now();
     const minSpawnInterval = (await storage.sync.get('config')).spawnInterval
       .min;
     const skipSpawnMessage = (note: any, level: LogLevelNames = 'softwarn') => {
       log[level](`Skipping spawnBalloon message: \r\n\t`, note);
-      log.timeEnd('info', 'Spawn Time');
-      log.groupEnd('info');
+      log.timeEnd('debug', 'Spawn Time');
+      log.groupEnd('debug');
     };
 
     // Check if there is a spawn timeout
@@ -165,8 +165,8 @@ const updateBadgeColors = () => {
       log.softerror(' - Error sending spawn balloon script to tab', tab.id, e);
     }
     lastSpawn = now;
-    log.timeEnd('info', 'Spawn Time');
-    log.groupEnd('info');
+    log.timeEnd('debug', 'Spawn Time');
+    log.groupEnd('debug');
   };
 
   const createSpawnAlarm = async (name: AlarmName) => {

diff --git a/src/popup/components/Leaderboard.tsx b/src/popup/components/Leaderboard.tsx
@@ -100,7 +100,7 @@ export default () => {
           <span className="flex-grow">
             <Caption />
           </span>
-          {data.rank && (
+          {data.rank && data.rank <= limit * maxPages && (
             <Tooltip>
               <TooltipTrigger asChild>
                 <Button

diff --git a/src/utils.ts b/src/utils.ts
@@ -127,7 +127,7 @@ export async function importStylesheet(id: string, href: string) {
     style.textContent = css;
 
     // Append the <style> element to the <head>
-    document.head.appendChild(style);
+    getBalloonContainer().appendChild(style);
   }
 }
 

diff --git a/tests/balloons.test.ts b/tests/balloons.test.ts
@@ -69,7 +69,9 @@ describe('Balloons', () => {
   test('all balloons have a corresponding test file', () => {
     balloonNames.forEach((name) => {
       const testName = `${name}.test.ts`;
-      expect(fs.existsSync(path.resolve(__dirname, `./balloons/${testName}`)));
+      expect(
+        fs.existsSync(path.resolve(__dirname, `./balloons/${testName}`))
+      ).toBeTruthy();
     });
   });
 

diff --git a/tests/balloons/confetti.test.ts b/tests/balloons/confetti.test.ts
@@ -0,0 +1,23 @@
+import { Confetti } from '@/balloons';
+import fetchMock from 'jest-fetch-mock';
+
+fetchMock.enableMocks();
+
+describe('Confetti Balloon', () => {
+  let balloon: Confetti;
+
+  beforeEach(() => {
+    balloon = new Confetti();
+
+    fetchMock.resetMocks();
+  });
+
+  test('name should be "confetti"', () => {
+    expect(balloon.name).toBe('confetti');
+  });
+
+  test('name should be the same as the class name', () => {
+    expect(balloon.name).toBe('confetti');
+    expect(balloon.name).toBe(Confetti.name.toLowerCase());
+  });
+});