Merge branch 'master' into production

deepjyoti30 · Feb 18, 2023 · 57f5970 · 57f5970
2 parents 0e362d3 + 4938203
commit 57f5970
Show file tree

Hide file tree

Showing 3 changed files with 11,361 additions and 1 deletion.
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
@@ -119,7 +119,7 @@ export default {
        */
       // If the string is of the new type then extract it separately.
       if (enteredUrl.includes("youtu.be")) {
-        return enteredUrl.replace("youtu.be/", "");
+        return enteredUrl.replace(/(https?:\/\/)?youtu.be\//g, "");
       }
 
       const urlParams = new URLSearchParams(

diff --git a/tests/__tests__/searchBar.test.js b/tests/__tests__/searchBar.test.js
@@ -46,6 +46,26 @@ describe("Mounted SearchBar", () => {
 
     expect(wrapper.vm.isYoutubeUrl).toBeTruthy();
 
+    wrapper.setData({
+      $route: {
+        query: {
+          query: "https://youtu.be/test"
+        }
+      }
+    });
+
+    expect(wrapper.vm.isYoutubeUrl).toBeTruthy();
+
+    wrapper.setData({
+      $route: {
+        query: {
+          query: "youtu.be/test"
+        }
+      }
+    });
+
+    expect(wrapper.vm.isYoutubeUrl).toBeTruthy();
+
     wrapper.setData({
       $route: {
         query: {
@@ -61,6 +81,8 @@ describe("Mounted SearchBar", () => {
     expect(wrapper.vm.extractVideoId("https://youtube.com/watch?v=test")).toBe(
       "test"
     );
+    expect(wrapper.vm.extractVideoId("https://youtu.be/test")).toBe("test");
+    expect(wrapper.vm.extractVideoId("youtu.be/test")).toBe("test");
   });
 
   it("should send search request for query", () => {