Skip to content

Commit

Permalink
Merge pull request #6 from Jarodiv/develop
Browse files Browse the repository at this point in the history
Merge develop
  • Loading branch information
Michael Strache authored Jul 1, 2021
2 parents 583a7a1 + cd09651 commit 951c860
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.

## Release 1.1.1

**Bugfixes**
- Fix code quality

## Release 1.1.0

**Features**
Expand Down
8 changes: 4 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jarodiv-ffmpeg",
"version": "1.0.1",
"version": "1.1.1",
"author": "Michael Strache ([email protected])",
"summary": "Installs FFmpeg",
"license": "Apache-2.0",
Expand All @@ -10,15 +10,15 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">=4.6.0"
"version_requirement": ">=4.6.0 < 8.0.0"
},
{
"name": "puppetlabs/yumrepo_core",
"version_requirement": ">=1.0.0"
"version_requirement": ">=1.0.0 < 2.0.0"
},
{
"name": "puppet/epel",
"version_requirement": ">=2.0.0"
"version_requirement": ">=2.0.0 < 4.0.0"
}
],
"operatingsystem_support": [
Expand Down
10 changes: 5 additions & 5 deletions spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
}
end

on_supported_os.each do | os, facts |
context "#{os}" do
on_supported_os.each do |os, facts|
context os do
let(:facts) do
facts
end

# Tests for parameters defaults
context "default parameters" do
context 'default parameters' do
it { is_expected.to compile.with_all_deps }

# package 'ffmpeg::base_package' ('ffmpeg') should be present
it { is_expected.to contain_package('ffmpeg') }
end

# Tests for parameters defaults
context "include devel package" do
context 'include devel package' do
let(:params) do
super().merge({ 'include_devel' => true })
end
Expand All @@ -38,4 +38,4 @@
end
end
end
end
end

0 comments on commit 951c860

Please sign in to comment.