Commit d6036f08 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

move activated? method to service

parent 5c3d6540f588
......@@ -23,10 +23,6 @@ class GitlabCiService < Service
after_save :compose_service_hook, if: :activated?
def activated?
active
end
def compose_service_hook
hook = service_hook || build_service_hook
hook.url = [project_url, "/build", "?token=#{token}"].join("")
......
......@@ -20,4 +20,8 @@ class Service < ActiveRecord::Base
has_one :service_hook
validates :project_id, presence: true
def activated?
active
end
end
......@@ -42,5 +42,9 @@
describe :commit_status_path do
it { @service.commit_status_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/builds/2ab7834c/status.json?token=verySecret"}
end
describe :build_page do
it { @service.build_page("2ab7834c").should == "http://ci.gitlab.org/projects/2/builds/2ab7834c"}
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment