Commit e8cf6b07 authored by James Edwards-Jones's avatar James Edwards-Jones

Fixed CSV specs and updated styling

parent 6d332057
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
%table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" } %table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" }
%tbody %tbody
%tr %tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;font-size:18px;" }
Your .csv export of #{ @issues_count } issues from project Your .csv export of #{ @issues_count } issues from project
%a{ href: project_url(@project), style: "color:#3777b0;text-decoration:none;" } %a{ href: project_url(@project), style: "color:#3777b0;text-decoration:none;" }
= @project.name = @project.name
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
- if current_user - if current_user
= link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do
= icon('rss') = icon('rss')
%button.csv_download_link.btn.append-right-10{ title: 'Download CSV' } %button.csv_download_link.btn.append-right-10.has-tooltip{ title: 'Download CSV' }
= icon('download') = icon('download')
- if can? current_user, :create_issue, @project - if can? current_user, :create_issue, @project
= link_to new_namespace_project_issue_path(@project.namespace, = link_to new_namespace_project_issue_path(@project.namespace,
......
...@@ -13,6 +13,7 @@ describe 'Issues csv', feature: true do ...@@ -13,6 +13,7 @@ describe 'Issues csv', feature: true do
it "downloads from a project's issue index" do it "downloads from a project's issue index" do
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
click_on 'Download CSV' click_on 'Download CSV'
click_on 'Request export'
expect(page.response_headers['Content-Type']).to include('csv') expect(page.response_headers['Content-Type']).to include('csv')
end end
...@@ -22,6 +23,7 @@ describe 'Issues csv', feature: true do ...@@ -22,6 +23,7 @@ describe 'Issues csv', feature: true do
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
click_on 'Download CSV' click_on 'Download CSV'
click_on 'Request export'
expect(csv.count).to eq 31 expect(csv.count).to eq 31
end end
...@@ -29,6 +31,7 @@ describe 'Issues csv', feature: true do ...@@ -29,6 +31,7 @@ describe 'Issues csv', feature: true do
it 'uses filters from issue index' do it 'uses filters from issue index' do
visit namespace_project_issues_path(project.namespace, project, state: :closed) visit namespace_project_issues_path(project.namespace, project, state: :closed)
click_on 'Download CSV' click_on 'Download CSV'
click_on 'Request export'
expect(csv.count).to eq 0 expect(csv.count).to eq 0
end end
......
require 'spec_helper' require 'spec_helper'
require 'email_spec' require 'email_spec'
require 'mailers/shared/notify'
describe Notify do describe Notify do
include EmailSpec::Matchers include EmailSpec::Matchers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment