Merge pull request #1241 from circleci/fix-test-webhook-button-for-bb-projects

appplemac · web-flow · commit 27a0c27db115 · 2016-06-22T14:02:15.000+02:00
Make test webhook button work for BB projects
diff --git a/src-cljs/frontend/api/path.cljs b/src-cljs/frontend/api/path.cljs
@@ -83,6 +83,13 @@
   (gstring/format "%s/invite"
                   (base-organization-url-path vcs-type org-name)))
 
+(defn project-hook-test [vcs-type project-name service-name]
+  (gstring/format
+   "%s/%s/hooks/%s/test"
+   (base-project-url-path vcs-type)
+    project-name
+    service-name))
+
 (defn build-retry [vcs-type org-name repo-name build-num]
   (gstring/format
    "%s/%s/%s/%s/retry"
diff --git a/src-cljs/frontend/controllers/controls.cljs b/src-cljs/frontend/controllers/controls.cljs
@@ -773,12 +773,15 @@
   [target message {:keys [project-id merge-paths service]} previous-state current-state]
   (let [uuid frontend.async/*uuid*
         project-name (vcs-url/project-name project-id)
+        vcs-type (vcs-url/vcs-type project-id)
         comms (get-in current-state [:comms])]
     (go
       (let [save-result (<! (save-project-settings project-id merge-paths current-state))
             test-result (if (= (:status save-result) :success)
-                          (let [test-result (<! (ajax/managed-ajax :post (gstring/format "/api/v1/project/%s/hooks/%s/test" project-name service)
-                                                                   :params {:project-id project-id}))]
+                          (let [test-result
+                                (<! (ajax/managed-ajax
+                                      :post (api-path/project-hook-test vcs-type project-name service)
+                                      :params {:project-id project-id}))]
                             (when (not= (:status test-result) :success)
                               (put! (:errors comms) [:api-error test-result]))
                             test-result)
