summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Paramio <hola@carlosparamio.com>2013-11-21 13:18:02 +0100
committerCarlos Paramio <hola@carlosparamio.com>2013-11-21 13:18:02 +0100
commit4db87f7c4bd46983c1aad8ed7cc7338ca7bbf72e (patch)
treeed2d258afa5b25bca4e7647a9b5f4ebb4ea6c115
parent4525fc840547358a270671ff107c3e4967679442 (diff)
downloadgitlab-ce-4db87f7c4bd46983c1aad8ed7cc7338ca7bbf72e.tar.gz
Integration with Assembla
-rw-r--r--app/models/assembla_service.rb45
-rw-r--r--app/models/project.rb3
-rw-r--r--features/project/service.feature6
-rw-r--r--features/steps/project/project_services.rb15
-rw-r--r--spec/models/assembla_service_spec.rb50
5 files changed, 118 insertions, 1 deletions
diff --git a/app/models/assembla_service.rb b/app/models/assembla_service.rb
new file mode 100644
index 00000000000..66ecf394784
--- /dev/null
+++ b/app/models/assembla_service.rb
@@ -0,0 +1,45 @@
+# == Schema Information
+#
+# Table name: services
+#
+# id :integer not null, primary key
+# type :string(255)
+# title :string(255)
+# token :string(255)
+# project_id :integer not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# active :boolean default(FALSE), not null
+# project_url :string(255)
+# subdomain :string(255)
+# room :string(255)
+#
+
+class AssemblaService < Service
+ include HTTParty
+
+ validates :token, presence: true, if: :activated?
+
+ def title
+ 'Assembla'
+ end
+
+ def description
+ 'Project Management Software (Source Commits Endpoint)'
+ end
+
+ def to_param
+ 'assembla'
+ end
+
+ def fields
+ [
+ { type: 'text', name: 'token', placeholder: '' }
+ ]
+ end
+
+ def execute(push)
+ url = "https://atlas.assembla.com/spaces/ouposp/github_tool?secret_key=#{token}"
+ AssemblaService.post(url, body: { payload: push }.to_json, headers: { 'Content-Type' => 'application/json' })
+ end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index e255f13c42d..eab7c14d6c6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -50,6 +50,7 @@ class Project < ActiveRecord::Base
has_one :pivotaltracker_service, dependent: :destroy
has_one :hipchat_service, dependent: :destroy
has_one :flowdock_service, dependent: :destroy
+ has_one :assembla_service, dependent: :destroy
has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
has_one :forked_from_project, through: :forked_project_link
@@ -224,7 +225,7 @@ class Project < ActiveRecord::Base
end
def available_services_names
- %w(gitlab_ci campfire hipchat pivotaltracker flowdock)
+ %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla)
end
def gitlab_ci?
diff --git a/features/project/service.feature b/features/project/service.feature
index 4805d2befbe..f8684f3b3b7 100644
--- a/features/project/service.feature
+++ b/features/project/service.feature
@@ -30,3 +30,9 @@ Feature: Project Services
And I click Flowdock service link
And I fill Flowdock settings
Then I should see Flowdock service settings saved
+
+ Scenario: Activate Assembla service
+ When I visit project "Shop" services page
+ And I click Assembla service link
+ And I fill Assembla settings
+ Then I should see Assembla service settings saved \ No newline at end of file
diff --git a/features/steps/project/project_services.rb b/features/steps/project/project_services.rb
index 70eafc875d4..2f248090831 100644
--- a/features/steps/project/project_services.rb
+++ b/features/steps/project/project_services.rb
@@ -12,6 +12,7 @@ class ProjectServices < Spinach::FeatureSteps
page.should have_content 'Campfire'
page.should have_content 'Hipchat'
page.should have_content 'GitLab CI'
+ page.should have_content 'Assembla'
end
And 'I click gitlab-ci service link' do
@@ -72,4 +73,18 @@ class ProjectServices < Spinach::FeatureSteps
Then 'I should see Flowdock service settings saved' do
find_field('Token').value.should == 'verySecret'
end
+
+ And 'I click Assembla service link' do
+ click_link 'Assembla'
+ end
+
+ And 'I fill Assembla settings' do
+ check 'Active'
+ fill_in 'Token', with: 'verySecret'
+ click_button 'Save'
+ end
+
+ Then 'I should see Assembla service settings saved' do
+ find_field('Token').value.should == 'verySecret'
+ end
end
diff --git a/spec/models/assembla_service_spec.rb b/spec/models/assembla_service_spec.rb
new file mode 100644
index 00000000000..0b961c81ac1
--- /dev/null
+++ b/spec/models/assembla_service_spec.rb
@@ -0,0 +1,50 @@
+# == Schema Information
+#
+# Table name: services
+#
+# id :integer not null, primary key
+# type :string(255)
+# title :string(255)
+# token :string(255)
+# project_id :integer not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# active :boolean default(FALSE), not null
+# project_url :string(255)
+# subdomain :string(255)
+# room :string(255)
+#
+
+require 'spec_helper'
+
+describe AssemblaService do
+ describe "Associations" do
+ it { should belong_to :project }
+ it { should have_one :service_hook }
+ end
+
+ describe "Execute" do
+ let(:user) { create(:user) }
+ let(:project) { create(:project_with_code) }
+
+ before do
+ @assembla_service = AssemblaService.new
+ @assembla_service.stub(
+ project_id: project.id,
+ project: project,
+ service_hook: true,
+ token: 'verySecret'
+ )
+ @sample_data = GitPushService.new.sample_data(project, user)
+ @api_url = 'https://atlas.assembla.com/spaces/ouposp/github_tool?secret_key=verySecret'
+ WebMock.stub_request(:post, @api_url)
+ end
+
+ it "should call FlowDock API" do
+ @assembla_service.execute(@sample_data)
+ WebMock.should have_requested(:post, @api_url).with(
+ body: /#{@sample_data[:before]}.*#{@sample_data[:after]}.*#{project.path}/
+ ).once
+ end
+ end
+end