Merge pull request #8580 from j0k3r/asana

Add Asana service

2 files changed, 23 insertions, 1 deletions

diff --git a/features/project/service.feature b/features/project/service.feature
index 85939a5c9ca..d0600aca010 100644
--- a/features/project/service.feature
+++ b/features/project/service.feature
@@ -72,4 +72,9 @@ Feature: Project Services
     And I click jetBrains TeamCity CI service link
     And I fill jetBrains TeamCity CI settings
     Then I should see jetBrains TeamCity CI service settings saved
-	
+
+  Scenario: Activate Asana service
+    When I visit project "Shop" services page
+    And I click Asana service link
+    And I fill Asana settings
+    Then I should see Asana service settings saved
diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb
index 09e86447058..957a16d06a8 100644
--- a/features/steps/project/services.rb
+++ b/features/steps/project/services.rb
@@ -16,6 +16,7 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
     page.should have_content 'Pushover'
     page.should have_content 'Atlassian Bamboo'
     page.should have_content 'JetBrains TeamCity'
+    page.should have_content 'Asana'
   end
 
   step 'I click gitlab-ci service link' do
@@ -102,6 +103,22 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
     find_field('Token').value.should == 'verySecret'
   end
 
+  step 'I click Asana service link' do
+    click_link 'Asana'
+  end
+
+  step 'I fill Asana settings' do
+    check 'Active'
+    fill_in 'Api key', with: 'verySecret'
+    fill_in 'Restrict to branch', with: 'master'
+    click_button 'Save'
+  end
+
+  step 'I should see Asana service settings saved' do
+    find_field('Api key').value.should == 'verySecret'
+    find_field('Restrict to branch').value.should == 'master'
+  end
+
   step 'I click email on push service link' do
     click_link 'Emails on push'
   end