From 2f704d83564f20f23c4adf2f6471cd745dd80e2a Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Thu, 11 Apr 2019 07:39:14 +0000 Subject: [PATCH] Delete static_fixtures.rb for static HAML fixtures --- .../fixtures/environments/table.html.haml | 11 ----------- .../fixtures/static/environments/table.html | 15 +++++++++++++++ spec/javascripts/fixtures/static_fixtures.rb | 19 ------------------- 3 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 spec/javascripts/fixtures/environments/table.html.haml create mode 100644 spec/javascripts/fixtures/static/environments/table.html delete mode 100644 spec/javascripts/fixtures/static_fixtures.rb diff --git a/spec/javascripts/fixtures/environments/table.html.haml b/spec/javascripts/fixtures/environments/table.html.haml deleted file mode 100644 index 59edc0396d2..00000000000 --- a/spec/javascripts/fixtures/environments/table.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -%table - %thead - %tr - %th Environment - %th Last deployment - %th Job - %th Commit - %th - %th - %tbody - %tr#environment-row diff --git a/spec/javascripts/fixtures/static/environments/table.html b/spec/javascripts/fixtures/static/environments/table.html new file mode 100644 index 00000000000..417af564ff1 --- /dev/null +++ b/spec/javascripts/fixtures/static/environments/table.html @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + +
EnvironmentLast deploymentJobCommit
diff --git a/spec/javascripts/fixtures/static_fixtures.rb b/spec/javascripts/fixtures/static_fixtures.rb deleted file mode 100644 index cb4b90cdca5..00000000000 --- a/spec/javascripts/fixtures/static_fixtures.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' - -describe ApplicationController, '(Static JavaScript fixtures)', type: :controller do - include JavaScriptFixturesHelpers - - Dir.glob('{,ee/}spec/javascripts/fixtures/**/*.haml').map do |file_path| - it "static/#{file_path.sub(%r{\A(ee/)?spec/javascripts/fixtures/}, '').sub(/\.haml\z/, '')}" do |example| - store_frontend_fixture(render_template(file_path), example.description) - end - end - - private - - def render_template(template_file_name) - controller = ApplicationController.new - controller.prepend_view_path(File.dirname(template_file_name)) - controller.render_to_string(template: File.basename(template_file_name), layout: false) - end -end