move activated? method to service

Dmitriy Zaporozhets
1 parent ce84e3f4
Showing 3 changed files with 8 additions and 4 deletions Show diff stats
app/models/gitlab_ci_service.rb
app/models/service.rb
spec/models/gitlab_ci_service_spec.rb
@@ -23,10 +23,6 @@ class GitlabCiService &lt; 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 &lt; ActiveRecord::Base
   has_one :service_hook
   validates :project_id, presence: true
+
+  def activated?
+    active
+  end
 end
@@ -42,5 +42,9 @@ describe GitlabCiService do
     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
	@@ -20,4 +20,8 @@ class Service < ActiveRecord::Base		@@ -20,4 +20,8 @@ class Service < ActiveRecord::Base
20	has_one :service_hook	20	has_one :service_hook
21		21
22	validates :project_id, presence: true	22	validates :project_id, presence: true
		23	+
		24	+ def activated?
		25	+ active
		26	+ end
23	end	27	end