fix after merging conflicts

c7ee816d · Valery Sizov · 3fcd75a9 · c7ee816d
Commit c7ee816d authored Nov 13, 2014 by Valery Sizov
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

features/steps/project/services.rb features/steps/project/services.rb +1 -0

No files found.
--- a/features/steps/project/services.rb
+++ b/features/steps/project/services.rb
@@ -156,6 +156,7 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
    find_field('Username').value.should == 'gitlab'
    find_field('Password').value.should_not == 'gitlab'
    find_field('Api version').value.should == '2'
+  end

  step 'I click Atlassian Bamboo CI service link' do
    click_link 'Atlassian Bamboo CI'