From 1f0fea37a920ce4d7b379b84b2196c1589327f77 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Thu, 4 Oct 2018 19:03:03 +0200
Subject: [PATCH] Fixed unit test

---
 scm-ui/src/repos/modules/branches.js      | 13 +++++-------
 scm-ui/src/repos/modules/branches.test.js | 26 ++---------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/scm-ui/src/repos/modules/branches.js b/scm-ui/src/repos/modules/branches.js
index 9b6a261a85..b4cddd63a3 100644
--- a/scm-ui/src/repos/modules/branches.js
+++ b/scm-ui/src/repos/modules/branches.js
@@ -1,11 +1,7 @@
 // @flow
-import {
-  FAILURE_SUFFIX,
-  PENDING_SUFFIX,
-  SUCCESS_SUFFIX
-} from "../../modules/types";
-import { apiClient } from "@scm-manager/ui-components";
-import type { Repository } from "@scm-manager/ui-types";
+import {FAILURE_SUFFIX, PENDING_SUFFIX, SUCCESS_SUFFIX} from "../../modules/types";
+import {apiClient} from "@scm-manager/ui-components";
+import type {Repository} from "@scm-manager/ui-types";
 
 export const FETCH_BRANCHES = "scm/repos/FETCH_BRANCHES";
 export const FETCH_BRANCHES_PENDING = `${FETCH_BRANCHES}_${PENDING_SUFFIX}`;
@@ -82,7 +78,8 @@ export default function reducer(
 ): Object {
   switch (action.type) {
     case FETCH_BRANCHES_SUCCESS:
-      const key = action.itemId;
+      const { namespace, name } = action.payload.repository;
+      const key = `${namespace}/${name}`;
       let oldBranchesByNames = { [key]: {} };
       if (state[key] !== undefined) {
         oldBranchesByNames[key] = state[key];
diff --git a/scm-ui/src/repos/modules/branches.test.js b/scm-ui/src/repos/modules/branches.test.js
index 361032c78a..f82495f736 100644
--- a/scm-ui/src/repos/modules/branches.test.js
+++ b/scm-ui/src/repos/modules/branches.test.js
@@ -1,14 +1,13 @@
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import fetchMock from "fetch-mock";
-import {
+import reducer, {
   FETCH_BRANCHES_FAILURE,
   FETCH_BRANCHES_PENDING,
   FETCH_BRANCHES_SUCCESS,
   fetchBranches,
   getBranchNames
 } from "./branches";
-import reducer from "./branches";
 
 const namespace = "foo";
 const name = "bar";
@@ -96,8 +95,7 @@ describe("branches", () => {
     const action = {
       type: FETCH_BRANCHES_SUCCESS,
       payload: {
-        namespace,
-        name,
+        repository,
         data: branches
       }
     };
@@ -120,7 +118,6 @@ describe("branches", () => {
       };
 
       const newState = reducer(oldState, action);
-      console.log(newState);
       expect(newState[key].byNames["branch1"]).toEqual(branch1);
       expect(newState[key].byNames["branch2"]).toEqual(branch2);
       expect(newState[key].byNames["branch3"]).toEqual(branch3);
@@ -128,25 +125,6 @@ describe("branches", () => {
   });
 
   describe("branch selectors", () => {
-    it("should get branches for namespace and name", () => {
-      const state = {
-        branches: {
-          [key]: {
-            byNames: {
-              branch1: branch1
-            }
-          }
-        }
-      };
-      const branches = getBranchesForNamespaceAndNameFromState(
-        namespace,
-        name,
-        state
-      );
-      expect(branches.length).toEqual(1);
-      expect(branches[0]).toEqual(branch1);
-    });
-
     it("should return branches names", () => {
       const state = {
         branches: {