Merge branch 'master' into sh-headless-chrome-support

* master: (97 commits)
  Eliminate N+1 queries in loading discussions.json endpoint
  Clean up read_registry scope changes
  Add missing import statements
  Improve “New project“ page description
  Fix notification message when admin label was modified
  Remove gaps under nav on build page
  Replace the 'project/snippets.feature' spinach test with an rspec analog
  Use correct group members path for members flyout link
  Fix docs for lightweight tag creation via API
  Replace the 'project/commits/revert.feature' spinach test with an rspec analog
  Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'
  Replace the 'project/archived.feature' spinach test with an rspec analog
  Fix broken link in docs/api/wiki.md
  Fixed the new sidebars width when browser has scrollbars
  Improve 'spec/features/profiles/*' specs
  Replace the 'search.feature' spinach test with an rspec analog
  dedupe yarn packages
  add dependency approvals (all MIT license)
  update build image to latest with node 8.x, yarn 1.0.2, and chrome 61
  Ensure we use `Entities::User` for non-admin `users/:id` API requests
  ...

4 files changed, 90 insertions, 0 deletions

diff --git a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
new file mode 100644
index 00000000000..1bd2098af6d
--- /dev/null
+++ b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'User comments on a snippet', :js do
+  let(:project) { create(:project) }
+  let!(:snippet) { create(:project_snippet, project: project, author: user) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    visit(project_snippet_path(project, snippet))
+  end
+
+  it 'leaves a comment on a snippet' do
+    page.within('.js-main-target-form') do
+      fill_in('note_note', with: 'Good snippet!')
+      click_button('Comment')
+    end
+
+    wait_for_requests
+
+    expect(page).to have_content('Good snippet!')
+  end
+end
diff --git a/spec/features/projects/snippets/user_deletes_snippet_spec.rb b/spec/features/projects/snippets/user_deletes_snippet_spec.rb
new file mode 100644
index 00000000000..ca5f7981c33
--- /dev/null
+++ b/spec/features/projects/snippets/user_deletes_snippet_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'User deletes a snippet' do
+  let(:project) { create(:project) }
+  let!(:snippet) { create(:project_snippet, project: project, author: user) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    visit(project_snippet_path(project, snippet))
+  end
+
+  it 'deletes a snippet' do
+    first(:link, 'Delete').click
+
+    expect(page).not_to have_content(snippet.title)
+  end
+end
diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb
new file mode 100644
index 00000000000..09a390443cf
--- /dev/null
+++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'User updates a snippet' do
+  let(:project) { create(:project) }
+  let!(:snippet) { create(:project_snippet, project: project, author: user) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    visit(project_snippet_path(project, snippet))
+  end
+
+  it 'updates a snippet' do
+    page.within('.detail-page-header') do
+      first(:link, 'Edit').click
+    end
+
+    fill_in('project_snippet_title', with: 'Snippet new title')
+    click_button('Save')
+
+    expect(page).to have_content('Snippet new title')
+  end
+end
diff --git a/spec/features/projects/snippets/user_views_snippets_spec.rb b/spec/features/projects/snippets/user_views_snippets_spec.rb
new file mode 100644
index 00000000000..e9992e00ca8
--- /dev/null
+++ b/spec/features/projects/snippets/user_views_snippets_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'User views snippets' do
+  let(:project) { create(:project) }
+  let!(:project_snippet) { create(:project_snippet, project: project, author: user) }
+  let!(:snippet) { create(:snippet, author: user) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    visit(project_snippets_path(project))
+  end
+
+  it 'shows snippets' do
+    expect(page).to have_content(project_snippet.title)
+    expect(page).not_to have_content(snippet.title)
+  end
+end