Commit cb9f1a4f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6149 from carlosparamio/assembla_hardcoded_project_name

Assembla service: Project name was hardcoded (oops)
parents 6d3a92f2 b3731580
......@@ -16,6 +16,8 @@
#
class AssemblaService < Service
attr_accessible :subdomain
include HTTParty
validates :token, presence: true, if: :activated?
......@@ -34,12 +36,13 @@ class AssemblaService < Service
def fields
[
{ type: 'text', name: 'token', placeholder: '' }
{ type: 'text', name: 'token', placeholder: '' },
{ type: 'text', name: 'subdomain', placeholder: '' }
]
end
def execute(push)
url = "https://atlas.assembla.com/spaces/ouposp/github_tool?secret_key=#{token}"
url = "https://atlas.assembla.com/spaces/#{subdomain}/github_tool?secret_key=#{token}"
AssemblaService.post(url, body: { payload: push }.to_json, headers: { 'Content-Type' => 'application/json' })
end
end
......@@ -33,14 +33,15 @@ describe AssemblaService do
project_id: project.id,
project: project,
service_hook: true,
token: 'verySecret'
token: 'verySecret',
subdomain: 'project_name'
)
@sample_data = GitPushService.new.sample_data(project, user)
@api_url = 'https://atlas.assembla.com/spaces/ouposp/github_tool?secret_key=verySecret'
@api_url = 'https://atlas.assembla.com/spaces/project_name/github_tool?secret_key=verySecret'
WebMock.stub_request(:post, @api_url)
end
it "should call FlowDock API" do
it "should call Assembla API" do
@assembla_service.execute(@sample_data)
WebMock.should have_requested(:post, @api_url).with(
body: /#{@sample_data[:before]}.*#{@sample_data[:after]}.*#{project.path}/
......
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