deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing some test

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-15 12:42:54 +02:00
parent f598cc7897
commit ac983319d3
4 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/steps/project/project_merge_requests.rb
View file

@ -110,6 +110,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And 'I leave a comment like "Line is wrong" on line 185 of the first file' do
save_and_open_page
within(:xpath, "//div[@class='diff_file'][1]") do
click_link "add-diff-line-note-0_185_185"
end

10
features/steps/shared/diff_note.rb
View file

@ -20,7 +20,7 @@ module SharedDiffNote
end
Given 'I leave a diff comment like "Typo, please fix"' do
find("#0_29_14.line_holder .js-add-diff-note-button").trigger("click")
find("#586fb7c4e1add2d4d24e27566ed7064680098646_29_14.line_holder .js-add-diff-note-button").trigger("click")
within(".diff_file") do
fill_in "note[note]", with: "Typo, please fix"
#click_button("Add Comment")
@ -29,7 +29,7 @@ module SharedDiffNote
end
Given 'I preview a diff comment text like "Should fix it :smile:"' do
find("#0_29_14.line_holder .js-add-diff-note-button").trigger("click")
find("#586fb7c4e1add2d4d24e27566ed7064680098646_29_14.line_holder .js-add-diff-note-button").trigger("click")
within(".diff_file") do
fill_in "note[note]", with: "Should fix it :smile:"
find(".js-note-preview-button").trigger("click")
@ -37,7 +37,7 @@ module SharedDiffNote
end
Given 'I preview another diff comment text like "DRY this up"' do
find("#0_57_41.line_holder .js-add-diff-note-button").trigger("click")
find("#586fb7c4e1add2d4d24e27566ed7064680098646_57_41.line_holder .js-add-diff-note-button").trigger("click")
within(".diff_file") do
fill_in "note[note]", with: "DRY this up"
find(".js-note-preview-button").trigger("click")
@ -45,11 +45,11 @@ module SharedDiffNote
end
Given 'I open a diff comment form' do
find("#0_29_14.line_holder .js-add-diff-note-button").trigger("click")
find("#586fb7c4e1add2d4d24e27566ed7064680098646_29_14.line_holder .js-add-diff-note-button").trigger("click")
end
Given 'I open another diff comment form' do
find("#0_57_41.line_holder .js-add-diff-note-button").trigger("click")
find("#586fb7c4e1add2d4d24e27566ed7064680098646_57_41.line_holder .js-add-diff-note-button").trigger("click")
end
Given 'I write a diff comment like ":-1: I don\'t like this"' do