[DRE-commits] [ruby-gitlab-emoji] 04/08: Update patch file

[Sagar Ippalpalli]

This is an automated email from the git hooks/post-receive script.

isaagar-guest pushed a commit to branch master
in repository ruby-gitlab-emoji.

commit d7c7bd872a3f77f8df8626ecef4dcd334151adf4
Author: Sagar Ippalpalli <i.vikram15 at gmail.com>
Date:   Thu Mar 24 14:14:10 2016 +0530

    Update patch file
---
 debian/install                   |  1 -
 debian/patches/assets-path.patch | 12 --------
 debian/patches/rspec3-port.patch | 59 ----------------------------------------
 debian/patches/series            |  3 +-
 debian/ruby-tests.rake           |  2 +-
 5 files changed, 2 insertions(+), 75 deletions(-)

diff --git a/debian/install b/debian/install
deleted file mode 100644
index 3856bb0..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-assets usr/share/ruby-gitlab-emoji
diff --git a/debian/patches/assets-path.patch b/debian/patches/assets-path.patch
deleted file mode 100644
index 97b538b..0000000
--- a/debian/patches/assets-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ruby-gitlab-emoji/lib/gitlab_emoji.rb
-===================================================================
---- ruby-gitlab-emoji.orig/lib/gitlab_emoji.rb
-+++ ruby-gitlab-emoji/lib/gitlab_emoji.rb
-@@ -16,6 +16,6 @@ module Emoji
-   end
- 
-   def images_path
--    File.expand_path("../../assets/images", __FILE__)
-+    '/usr/share/ruby-gitlab-emoji/assets/images'
-   end
- end
diff --git a/debian/patches/rspec3-port.patch b/debian/patches/rspec3-port.patch
deleted file mode 100644
index 919c2f1..0000000
--- a/debian/patches/rspec3-port.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Fix tests and port it to RSpec 3 syntax
- One of the tests had an incorrect equality check. Also, tests used older Rspec
- syntax. Fixed these two.
-Author: Balasankar C <balasankarc at autistici.org>
-Bug: https://gitlab.com/gitlab-org/gitlab_emoji/issues/4
-Last-Update: 2015-12-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ruby-gitlab-emoji/spec/gitlab_emoji_spec.rb
-===================================================================
---- ruby-gitlab-emoji.orig/spec/gitlab_emoji_spec.rb
-+++ ruby-gitlab-emoji/spec/gitlab_emoji_spec.rb
-@@ -5,27 +5,27 @@ describe Emoji do
-   describe 'emojis' do
-     let(:emojis) { Emoji.emojis }
- 
--    it { emojis.should be_a(Hash) }
-+    it { expect(emojis).to be_a(Hash) }
-     it { emojis.size.should eq(1619) }
-   end
- 
-   describe 'emojis_by_moji' do
-     let(:emojis) { Emoji.emojis_by_moji }
- 
--    it { emojis.should be_a(Hash) }
--    it { emojis.size.should eq(824) }
-+    it { expect(emojis).to be_a(Hash) }
-+    it { expect(emojis.size).to eq(824) }
-   end
- 
-   describe 'emojis_names' do
-     subject { Emoji.emojis_names }
- 
--    it { should be_a(Array) }
--    it { should include ("+1") }
-+    it { is_expected.to be_a(Array) }
-+    it { is_expected.to include ("+1") }
-   end
- 
-   describe 'emoji_filename' do
-     subject { Emoji.emoji_filename("+1") }
- 
--    it { should eq("1F44D") }
-+    it { is_expected.to eq("1F44D") }
-   end
- end
-Index: ruby-gitlab-emoji/spec/spec_helper.rb
-===================================================================
---- ruby-gitlab-emoji.orig/spec/spec_helper.rb
-+++ ruby-gitlab-emoji/spec/spec_helper.rb
-@@ -5,7 +5,7 @@
- #
- # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
- RSpec.configure do |config|
--  config.treat_symbols_as_metadata_keys_with_true_values = true
-+  # config.treat_symbols_as_metadata_keys_with_true_values = true
-   config.run_all_when_everything_filtered = true
-   config.filter_run :focus
- 
diff --git a/debian/patches/series b/debian/patches/series
index 46a186c..7ee1f5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-rspec3-port.patch
-assets-path.patch
+1000_Rspec3_port.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index cf1591e..7877f2b 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,5 @@
 require 'gem2deb/rake/spectask'
 
 Gem2Deb::Rake::RSpecTask.new do |spec|
-  spec.pattern = './spec/**/*_spec.rb'
+  spec.pattern = './spec/**/*.rb'
 end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gitlab-emoji.git