Merge branch 'master' into 'trigger-source'

# Conflicts:
#   db/schema.rb

2 files changed, 6 insertions, 6 deletions

diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 5549fc25525..624f1a7858b 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -27,11 +27,11 @@ module SharedBuilds
   end
 
   step 'I visit recent build details page' do
-    visit namespace_project_build_path(@project.namespace, @project, @build)
+    visit namespace_project_job_path(@project.namespace, @project, @build)
   end
 
   step 'I visit project builds page' do
-    visit namespace_project_builds_path(@project.namespace, @project)
+    visit namespace_project_jobs_path(@project.namespace, @project)
   end
 
   step 'recent build has artifacts available' do
@@ -56,7 +56,7 @@ module SharedBuilds
   end
 
   step 'I access artifacts download page' do
-    visit download_namespace_project_build_artifacts_path(@project.namespace, @project, @build)
+    visit download_namespace_project_job_artifacts_path(@project.namespace, @project, @build)
   end
 
   step 'I see details of a build' do
diff --git a/features/steps/shared/markdown.rb b/features/steps/shared/markdown.rb
index 6610b97ecb2..c2bec2a6320 100644
--- a/features/steps/shared/markdown.rb
+++ b/features/steps/shared/markdown.rb
@@ -30,7 +30,7 @@ module SharedMarkdown
   end
 
   step 'I should see the Markdown write tab' do
-    expect(find('.gfm-form')).to have_css('.js-md-write-button', visible: true)
+    expect(first('.gfm-form')).to have_link('Write', visible: true)
   end
 
   step 'I should see the Markdown preview' do
@@ -49,9 +49,9 @@ module SharedMarkdown
   end
 
   step 'I preview a description text like "Bug fixed :smile:"' do
-    page.within('.gfm-form') do
+    page.within(first('.gfm-form')) do
       fill_in 'Description', with: 'Bug fixed :smile:'
-      find('.js-md-preview-button').click
+      click_link 'Preview'
     end
   end