Skip to content

Commit 6ed1d6c

Browse files
authored
Merge pull request #655 from bleskodev/bd/settings-cleanup-tests-improvement
Add test to confirm fix for issue #674
2 parents 686b18f + 100be0e commit 6ed1d6c

3 files changed

Lines changed: 47 additions & 16 deletions

File tree

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Style/GlobalVars:
2+
AllowedVariables: [$rr_version, $rr_url]

.solargraph.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
include:
3+
- "**/*.rb"
4+
exclude:
5+
- spec/**/*
6+
- test/**/*
7+
- vendor/**/*
8+
- ".bundle/**/*"
9+
require: []
10+
domains: []
11+
reporters:
12+
- rubocop
13+
- require_not_found
14+
formatter:
15+
rubocop:
16+
cops: safe
17+
except: []
18+
only: []
19+
extra_args: []
20+
require_paths: []
21+
plugins: []
22+
max_files: 5000
Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,54 @@
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>
1717
#
18+
19+
require 'rspec'
1820
require 'rubyripper/preferences/cleanup'
1921
require 'rubyripper/preferences/data'
2022

2123
describe Preferences::Cleanup do
2224

23-
let (:prefs) { double('Preferences::Main').as_null_object }
24-
let (:pref_data) { Preferences::Data.new }
25-
let (:fileAndDir) { double('FileAndDir').as_null_object }
26-
let (:cleanup) { Preferences::Cleanup.new(fileAndDir, prefs) }
25+
let(:prefs) { double('Preferences::Main').as_null_object }
26+
let(:pref_data) { Preferences::Data.new }
27+
let(:fileAndDir) { double('FileAndDir').as_null_object }
28+
let(:cleanup) { Preferences::Cleanup.new(fileAndDir, prefs) }
2729

28-
context "When settings contain references to freedb as selected metadata provider" do
30+
context 'When settings contain references to freedb as selected metadata provider' do
2931
before(:each) do
30-
pref_data.site = ""
31-
pref_data.metadataProvider = ""
32+
pref_data.site = ''
33+
pref_data.metadataProvider = ''
3234
expect(prefs).to receive(:data).and_return pref_data
3335
end
3436

35-
it "should replace freedb with gnudb as selected metadata provider" do
37+
it 'should replace freedb with gnudb as selected metadata provider' do
3638
pref_data.metadataProvider = 'freedb'
37-
cleanup.migrateFreedbToGnudb()
39+
cleanup.migrateFreedbToGnudb
3840
expect(pref_data.metadataProvider).to eq('gnudb')
3941
end
4042

41-
it "should not replace musicbrainz as selected metadata provider with gnudb" do
43+
it 'should not replace musicbrainz as selected metadata provider with gnudb' do
4244
pref_data.metadataProvider = 'musicbrainz'
43-
cleanup.migrateFreedbToGnudb()
45+
cleanup.migrateFreedbToGnudb
4446
expect(pref_data.metadataProvider).to eq('musicbrainz')
4547
end
4648

47-
it "should not replace none as selected metadata provider with gnudb" do
49+
it 'should not replace none as selected metadata provider with gnudb' do
4850
pref_data.metadataProvider = 'none'
49-
cleanup.migrateFreedbToGnudb()
51+
cleanup.migrateFreedbToGnudb
5052
expect(pref_data.metadataProvider).to eq('none')
5153
end
5254

53-
it "should replace freedb site with gnudb site" do
55+
it 'should replace freedb site with gnudb site' do
5456
pref_data.site = 'http://freedb.freedb.org/~ccdb/ccdb.cgi'
55-
cleanup.migrateFreedbToGnudb()
57+
cleanup.migrateFreedbToGnudb
5658
expect(pref_data.site).to eq('http://gnudb.gnudb.org/~ccdb/ccdb.cgi')
5759
end
5860

59-
end
61+
it 'should NOT replace freedb site with gnudb site when it is not a real/full match' do
62+
pref_data.site = 'http://freedbtest.dyndns.org/~ccdb/ccdb.cgi'
63+
cleanup.migrateFreedbToGnudb
64+
expect(pref_data.site).to eq('http://freedbtest.dyndns.org/~ccdb/ccdb.cgi')
65+
end
6066

67+
end
6168
end

0 commit comments

Comments
 (0)