Merge branch '8088_embedded_snippets_support' into 'master'

Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695

Merge branch '8088_embedded_snippets_support' into 'master'
cee3df6c · Grzegorz Bizon · 4ed152e4 · 99f278f6 · cee3df6c · cee3df6c
Commit cee3df6c authored 6 years ago by Grzegorz Bizon
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -19,11 +19,32 @@
  %h2.snippet-title.prepend-top-0.append-bottom-0
    = markdown_field(@snippet, :title)
-  - if @snippet.updated_at != @snippet.created_at
-    = edited_time_ago_with_tooltip(@snippet, placement: 'bottom', html_class: 'snippet-edited-ago', exclude_author: true)
  - if @snippet.description.present?
    .description
      .wiki
        = markdown_field(@snippet, :description)
      %textarea.hidden.js-task-list-field
        = @snippet.description
+  - if @snippet.updated_at != @snippet.created_at
+    = edited_time_ago_with_tooltip(@snippet, placement: 'bottom', html_class: 'snippet-edited-ago', exclude_author: true)
+  - if public_snippet?
+    .embed-snippet
+      .input-group
+        .input-group-btn
+          %button.btn.embed-toggle{ 'data-toggle': 'dropdown', type: 'button' }
+            %span.js-embed-action= _("Embed")
+            = sprite_icon('angle-down', size: 12)
+          %ul.dropdown-menu.dropdown-menu-selectable.embed-toggle-list
+            %li
+              %button.js-embed-btn.btn.btn-transparent.is-active{ type: 'button' }
+                %strong.embed-toggle-list-item= _("Embed")
+            %li
+              %button.js-share-btn.btn.btn-transparent{ type: 'button' }
+                %strong.embed-toggle-list-item= _("Share")
+        %input.js-snippet-url-area.snippet-embed-input.form-control{ type: "text", autocomplete: 'off', value: snippet_embed }
+        .input-group-btn
+          %button.js-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '#snippet-url-area' }
+            = sprite_icon('duplicate', size: 16)
+    .clearfix
--- a/app/views/shared/snippets/show.js.haml
+++ b/app/views/shared/snippets/show.js.haml
+document.write('#{escape_javascript(stylesheet_link_tag "#{stylesheet_url 'snippets'}")}');
+document.write('#{escape_javascript(render 'shared/snippets/embed')}');
--- a/changelogs/unreleased/8088_embedded_snippets_support.yml
+++ b/changelogs/unreleased/8088_embedded_snippets_support.yml
+---
+title: Adds Embedded Snippets Support
+merge_request: 15695
+author: haseebeqx
+type: added
--- a/config/application.rb
+++ b/config/application.rb
@@ -113,6 +113,7 @@ module Gitlab
    config.assets.precompile << "performance_bar.css"
    config.assets.precompile << "lib/ace.js"
    config.assets.precompile << "test.css"
+    config.assets.precompile << "snippets.css"
    config.assets.precompile << "locale/**/app.js"
    # Import gitlab-svgs directly from vendored directory

--- a/spec/features/snippets/embedded_snippet_spec.rb
+++ b/spec/features/snippets/embedded_snippet_spec.rb
+require 'spec_helper'
+describe 'Embedded Snippets' do
+  let(:snippet) { create(:personal_snippet, :public, file_name: 'random_dir.rb', content: content) }
+  let(:content) { "require 'fileutils'\nFileUtils.mkdir_p 'some/random_dir'\n" }
+  it 'loads snippet', :js do
+    script_url = "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}/#{snippet_path(snippet, format: 'js')}"
+    embed_body = "<html><body><script src=\"#{script_url}\"></script></body></html>"
+    rack_app = proc do
+      ['200', { 'Content-Type' => 'text/html' }, [embed_body]]
+    end
+    server = Capybara::Server.new(rack_app)
+    server.boot
+    visit("http://#{server.host}:#{server.port}/embedded_snippet.html")
+    expect(page).to have_content("random_dir.rb")
+    expect(page).to have_content("require 'fileutils'")
+    expect(page).to have_link('Open raw')
+    expect(page).to have_link('Download')
+  end
+end
--- a/spec/helpers/icons_helper_spec.rb
+++ b/spec/helpers/icons_helper_spec.rb
@@ -162,4 +162,11 @@ describe IconsHelper do
      expect(file_type_icon_class('file', 0, 'CHANGELOG')).to eq 'file-text-o'
    end
  end
+  describe '#external_snippet_icon' do
+    it 'returns external snippet icon' do
+      expect(external_snippet_icon('download').to_s)
+        .to eq("<span class=\"gl-snippet-icon gl-snippet-icon-download\"></span>")
+    end
+  end
 end
--- a/spec/helpers/snippets_helper_spec.rb
+++ b/spec/helpers/snippets_helper_spec.rb
+require 'spec_helper'
+describe SnippetsHelper do
+  include IconsHelper
+  describe '#embedded_snippet_raw_button' do
+    it 'gives view raw button of embedded snippets for project snippets' do
+      @snippet = create(:project_snippet, :public)
+      expect(embedded_snippet_raw_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{raw_project_snippet_url(@snippet.project, @snippet)}\">#{external_snippet_icon('doc_code')}</a>")
+    end
+    it 'gives view raw button of embedded snippets for personal snippets' do
+      @snippet = create(:personal_snippet, :public)
+      expect(embedded_snippet_raw_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{raw_snippet_url(@snippet)}\">#{external_snippet_icon('doc_code')}</a>")
+    end
+  end
+  describe '#embedded_snippet_download_button' do
+    it 'gives download button of embedded snippets for project snippets' do
+      @snippet = create(:project_snippet, :public)
+      expect(embedded_snippet_download_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" title=\"Download\" rel=\"noopener noreferrer\" href=\"#{raw_project_snippet_url(@snippet.project, @snippet, inline: false)}\">#{external_snippet_icon('download')}</a>")
+    end
+    it 'gives download button of embedded snippets for personal snippets' do
+      @snippet = create(:personal_snippet, :public)
+      expect(embedded_snippet_download_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" title=\"Download\" rel=\"noopener noreferrer\" href=\"#{raw_snippet_url(@snippet, inline: false)}\">#{external_snippet_icon('download')}</a>")
+    end
+  end
+end