diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-11 07:39:15 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-11 07:39:15 +0000 |
commit | c2443d0aa5262f036bc40b13cca92864fd5a98c1 (patch) | |
tree | 499bb5655f552842cef46b7279867237f02018a8 | |
parent | 924cd417c4936d655a53ea6b3674ae6a17d7a4c2 (diff) | |
parent | 2f704d83564f20f23c4adf2f6471cd745dd80e2a (diff) | |
download | gitlab-ce-c2443d0aa5262f036bc40b13cca92864fd5a98c1.tar.gz |
Merge branch 'winh-delete-static_fixtures.rb' into 'master'
Delete static_fixtures.rb for static HAML fixtures
Closes #59200
See merge request gitlab-org/gitlab-ce!27145
-rw-r--r-- | spec/javascripts/fixtures/environments/table.html.haml | 11 | ||||
-rw-r--r-- | spec/javascripts/fixtures/static/environments/table.html | 15 | ||||
-rw-r--r-- | spec/javascripts/fixtures/static_fixtures.rb | 19 |
3 files changed, 15 insertions, 30 deletions
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 @@ +<table> +<thead> +<tr> +<th>Environment</th> +<th>Last deployment</th> +<th>Job</th> +<th>Commit</th> +<th></th> +<th></th> +</tr> +</thead> +<tbody> +<tr id="environment-row"></tr> +</tbody> +</table> 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 |