moved orderbranches function and tests in seperate file

scm-ui/src/repos/branches/containers/BranchesOverview.js

@@ -4,9 +4,9 @@ import {
   fetchBranches,
   getBranches,
   getFetchBranchesFailure,
-  isFetchBranchesPending,
+  isFetchBranchesPending
-  orderBranches
 } from "../modules/branches";
+import { orderBranches } from "./OrderBranches";
 import { connect } from "react-redux";
 import type { Branch, Repository } from "@scm-manager/ui-types";
 import { compose } from "redux";

scm-ui/src/repos/branches/containers/OrderBranches.js

@@ -0,0 +1,32 @@
+// @flow
+
+// master, default should always be the first one,
+// followed by develop the rest should be ordered by its name
+import type {Branch} from "@scm-manager/ui-types";
+
+export function orderBranches(branches: Branch[]) {
+  branches.sort((a, b) => {
+    if (a.defaultBranch && !b.defaultBranch) {
+      return -20;
+    } else if (!a.defaultBranch && b.defaultBranch) {
+      return 20;
+    } else if (a.name === "master" && b.name !== "master") {
+      return -10;
+    } else if (a.name !== "master" && b.name === "master") {
+      return 10;
+    } else if (a.name === "default" && b.name !== "default") {
+      return -10;
+    } else if (a.name !== "default" && b.name === "default") {
+      return 10;
+    } else if (a.name === "develop" && b.name !== "develop") {
+      return -5;
+    } else if (a.name !== "develop" && b.name === "develop") {
+      return 5;
+    } else if (a.name < b.name) {
+      return -1;
+    } else if (a.name > b.name) {
+      return 1;
+    }
+    return 0;
+  });
+}

scm-ui/src/repos/branches/containers/OrderBranches.test.js

@@ -0,0 +1,51 @@
+import { orderBranches } from "./OrderBranches";
+
+const branch1 = { name: "branch1", revision: "revision1" };
+const branch2 = { name: "branch2", revision: "revision2" };
+const branch3 = { name: "branch3", revision: "revision3", defaultBranch: true };
+const defaultBranch = {
+  name: "default",
+  revision: "revision4",
+  defaultBranch: false
+};
+const developBranch = {
+  name: "develop",
+  revision: "revision5",
+  defaultBranch: false
+};
+const masterBranch = {
+  name: "master",
+  revision: "revision6",
+  defaultBranch: false
+};
+
+describe("order branches", () => {
+  it("should return branches", () => {
+    let branches = [branch1, branch2];
+    orderBranches(branches);
+    expect(branches).toEqual([branch1, branch2]);
+  });
+
+  it("should return defaultBranch first", () => {
+    let branches = [branch1, branch2, branch3];
+    orderBranches(branches);
+    expect(branches).toEqual([branch3, branch1, branch2]);
+  });
+
+  it("should order special branches as follows: master > default > develop", () => {
+    let branches = [defaultBranch, developBranch, masterBranch];
+    orderBranches(branches);
+    expect(branches).toEqual([masterBranch, defaultBranch, developBranch]);
+  });
+
+  it("should order special branches but starting with defaultBranch", () => {
+    let branches = [masterBranch, developBranch, defaultBranch, branch3];
+    orderBranches(branches);
+    expect(branches).toEqual([
+      branch3,
+      masterBranch,
+      defaultBranch,
+      developBranch
+    ]);
+  });
+});

scm-ui/src/repos/branches/modules/branches.js

@@ -232,32 +232,3 @@ function createKey(repository: Repository): string {
   const { namespace, name } = repository;
   return `${namespace}/${name}`;
 }
-
-// master, default should always be the first one,
-// followed by develop the rest should be ordered by its name
-export function orderBranches(branches: Branch[]) {
-  branches.sort((a, b) => {
-    if (a.defaultBranch && !b.defaultBranch) {
-      return -20;
-    } else if (!a.defaultBranch && b.defaultBranch) {
-      return 20;
-    } else if (a.name === "master" && b.name !== "master") {
-      return -10;
-    } else if (a.name !== "master" && b.name === "master") {
-      return 10;
-    } else if (a.name === "default" && b.name !== "default") {
-      return -10;
-    } else if (a.name !== "default" && b.name === "default") {
-      return 10;
-    } else if (a.name === "develop" && b.name !== "develop") {
-      return -5;
-    } else if (a.name !== "develop" && b.name === "develop") {
-      return 5;
-    } else if (a.name < b.name) {
-      return -1;
-    } else if (a.name > b.name) {
-      return 1;
-    }
-    return 0;
-  });
-}

scm-ui/src/repos/branches/modules/branches.test.js

@@ -6,7 +6,6 @@ import reducer, {
   FETCH_BRANCHES_FAILURE,
   FETCH_BRANCHES_PENDING,
   FETCH_BRANCHES_SUCCESS,
-  FETCH_BRANCH,
   FETCH_BRANCH_PENDING,
   FETCH_BRANCH_SUCCESS,
   FETCH_BRANCH_FAILURE,
@@ -16,8 +15,7 @@ import reducer, {
   getBranch,
   getBranches,
   getFetchBranchesFailure,
-  isFetchBranchesPending,
+  isFetchBranchesPending
-  orderBranches
 } from "./branches";
 
 const namespace = "foo";
@@ -35,18 +33,7 @@ const repository = {
 
 const branch1 = { name: "branch1", revision: "revision1" };
 const branch2 = { name: "branch2", revision: "revision2" };
-const branch3 = { name: "branch3", revision: "revision3", defaultBranch: true };
+const branch3 = { name: "branch3", revision: "revision3" };
-const defaultBranch = {
-  name: "default",
-  revision: "revision4",
-  defaultBranch: false
-};
-const developBranch = {
-  name: "develop",
-  revision: "revision5",
-  defaultBranch: false
-};
-const masterBranch = { name: "master", revision: "revision6", defaultBranch: false };
 
 describe("branches", () => {
   describe("fetch branches", () => {
@@ -293,30 +280,4 @@ describe("branches", () => {
       expect(getFetchBranchesFailure({}, repository)).toBeUndefined();
     });
   });
-
-  describe("sort branches", () => {
-    it("should return branches", () => {
-      let branches = [branch1, branch2];
-      orderBranches(branches);
-      expect(branches).toEqual([branch1, branch2]);
-    });
-
-    it("should return defaultBranch first", () => {
-      let branches = [branch1, branch2, branch3];
-      orderBranches(branches);
-      expect(branches).toEqual([branch3, branch1, branch2]);
-    });
-
-    it("should order special branches as follows: master > default > develop", () => {
-      let branches = [defaultBranch, developBranch, masterBranch];
-      orderBranches(branches);
-      expect(branches).toEqual([masterBranch, defaultBranch, developBranch]);
-    });
-
-    it("should order special branches but starting with defaultBranch", () => {
-      let branches = [masterBranch, developBranch, defaultBranch, branch3];
-      orderBranches(branches);
-      expect(branches).toEqual([branch3, masterBranch, defaultBranch, developBranch]);
-    });
-  });
 });