kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:gitlabhq/gitlabhq

This commit is contained in:
Dmitriy Zaporozhets 2014-09-24 12:27:10 +03:00
parent 4d5435410f b794fdbbbe
commit b390ee1a83
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/steps/project/multiselect_blob.rb
View File

@ -12,7 +12,7 @@ class Spinach::Features::ProjectMultiselectBlob < Spinach::FeatureSteps
step "I shift-click line #{line_number} in file" do step "I shift-click line #{line_number} in file" do
script = "$('#L#{line_number}').trigger($.Event('click', { shiftKey: true }));" script = "$('#L#{line_number}').trigger($.Event('click', { shiftKey: true }));"
page.evaluate_script(script) execute_script(script)
end end
end end
end end
@ -45,11 +45,11 @@ class Spinach::Features::ProjectMultiselectBlob < Spinach::FeatureSteps
check_state_steps *Array(1..5), Array(1..2), Array(1..3), Array(1..4), Array(1..5), Array(3..5) check_state_steps *Array(1..5), Array(1..2), Array(1..3), Array(1..4), Array(1..5), Array(3..5)
step 'I go back in history' do step 'I go back in history' do
page.evaluate_script("window.history.back()") go_back
end end
step 'I go forward in history' do step 'I go forward in history' do
page.evaluate_script("window.history.forward()") go_forward
end end
step 'I click on ".gitignore" file in repo' do step 'I click on ".gitignore" file in repo' do

12
features/steps/project/wiki.rb
View File

@ -11,8 +11,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end end
step 'I should be redirected back to the Edit Home Wiki page' do step 'I should be redirected back to the Edit Home Wiki page' do
url = URI.parse(current_url) current_path.should == project_wiki_path(project, :home)
url.path.should == project_wiki_path(project, :home)
end end
step 'I create the Wiki Home page' do step 'I create the Wiki Home page' do
@ -51,8 +50,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end end
step 'I should be redirected back to that Wiki page' do step 'I should be redirected back to that Wiki page' do
url = URI.parse(current_url) current_path.should == project_wiki_path(project, @page)
url.path.should == project_wiki_path(project, @page)
end end
step 'That page has two revisions' do step 'That page has two revisions' do
@ -104,8 +102,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end end
step 'I should see the image from wiki repo' do step 'I should see the image from wiki repo' do
url = URI.parse(current_url) current_path.should match('wikis/image.jpg')
url.path.should match("wikis/image.jpg")
page.should_not have_xpath('/html') # Page should render the image which means there is no html involved page.should_not have_xpath('/html') # Page should render the image which means there is no html involved
Gollum::Wiki.any_instance.unstub(:file) Gollum::Wiki.any_instance.unstub(:file)
Gollum::File.any_instance.unstub(:mime_type) Gollum::File.any_instance.unstub(:mime_type)
@ -121,8 +118,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end end
step 'I should see the new wiki page form' do step 'I should see the new wiki page form' do
url = URI.parse(current_url) current_path.should match('wikis/image.jpg')
url.path.should match("wikis/image.jpg")
page.should have_content('New Wiki Page') page.should have_content('New Wiki Page')
page.should have_content('Editing - image.jpg') page.should have_content('Editing - image.jpg')
end end