Merge branch 'master' into rails-8-1-support

pitr · web-flow · commit 436e4f31ef12 · 2025-11-24T00:19:12.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,6 @@ gem "haml"
 gem "slim-rails"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec
diff --git a/README.md b/README.md
@@ -3,18 +3,14 @@
 [![Gem Version](https://badge.fury.io/rb/angular-rails-templates.png)](http://badge.fury.io/rb/angular-rails-templates)
 [![Coverage Status](https://coveralls.io/repos/github/pitr/angular-rails-templates/badge.svg?branch=master)](https://coveralls.io/github/pitr/angular-rails-templates?branch=master)
 [![Code Climate](https://codeclimate.com/github/pitr/angular-rails-templates/badges/gpa.svg)](https://codeclimate.com/github/pitr/angular-rails-templates)
-[![Issue Stats](http://issuestats.com/github/pitr/angular-rails-templates/badge/pr)](http://issuestats.com/github/pitr/angular-rails-templates)
-[![Issue Stats](http://issuestats.com/github/pitr/angular-rails-templates/badge/issue)](http://issuestats.com/github/pitr/angular-rails-templates)
-[![Stories in Ready](https://badge.waffle.io/pitr/angular-rails-templates.png?label=ready&title=Ready)](https://waffle.io/pitr/angular-rails-templates)
 
 Adds your HTML templates into Angular's `$templateCache` using Rails asset pipeline.
 
 **IMPORTANT**: for Rails 4.2+ use version 1.0+ of this gem. For Rails 3 - 4.1 use version 0.x
 
 Branch      | Build Status
 ------------|---------
-master      | [![Build Status](https://github.com/pitr/angular-rails-templates/workflows/build/badge.svg)](https://github.com/pitr/angular-rails-templates)
-0-x-stable  | [![Build Status](https://travis-ci.org/pitr/angular-rails-templates.png?branch=0-x-stable)](https://travis-ci.org/pitr/angular-rails-templates)
+master      | [![Build Status](https://github.com/pitr/angular-rails-templates/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/pitr/angular-rails-templates)
 
 It removes the need for AJAX calls to retrieve the templates (or for you to manually set them into the DOM).
 
diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_5.0_sprockets4.gemfile b/gemfiles/rails_5.0_sprockets4.gemfile
@@ -6,6 +6,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_5.2_sprockets4.gemfile b/gemfiles/rails_5.2_sprockets4.gemfile
@@ -6,6 +6,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_head.gemfile b/gemfiles/rails_head.gemfile
@@ -5,6 +5,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/gemfiles/rails_head_sprockets4.gemfile b/gemfiles/rails_head_sprockets4.gemfile
@@ -6,6 +6,6 @@ gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-gem 'coveralls', require: false
+gem 'coveralls_reborn', require: false
 
 gemspec :path => ".././"
diff --git a/test/integration/user_assets_integration_test.rb b/test/integration/user_assets_integration_test.rb
@@ -102,7 +102,7 @@
       visit '/assets/subfolder/haml_template.js'
       page.source.must_include %Q{// source: app/assets/javascripts/subfolder/haml_template.html.haml}
       page.source.must_include %Q{$templateCache.put("subfolder/haml_template.html"}
-      page.source.must_include %q{"<div class='hello-world'>Subfolder-HAML</div>"}
+      page.source.must_match /['"]<div class=['"]hello-world['"]>Subfolder-HAML<\/div>['"]/ # depending on versions, single and double quotes are swapped
     end
   end
 
