diff --git a/Gemfile b/Gemfile index f681fe9bf..6434a304f 100644 --- a/Gemfile +++ b/Gemfile @@ -136,7 +136,6 @@ group :development, :test do gem 'poltergeist', '1.6.0' # We are using PhantomJS instead gem 'phantomjs', '1.9.8.0' gem 'fabrication', '2.13.2' # Replacement for fixtures - gem 'shoulda-matchers', '2.8.0', require: false # Additional matchers for RSpec gem 'launchy', '2.4.3' # for opening browser automatically # helper gems diff --git a/Gemfile.lock b/Gemfile.lock index 9bb7523f4..af3056d91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -494,8 +494,6 @@ GEM selectize-rails (0.12.1) sexp_processor (4.6.0) shellany (0.0.1) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) simplecov (0.10.0) docile (~> 1.1.0) json (~> 1.8) @@ -648,7 +646,6 @@ DEPENDENCIES sdoc (= 0.4.1) select2-rails (= 3.5.9.3) selectize-rails (= 0.12.1) - shoulda-matchers (= 2.8.0) simplecov (= 0.10.0) simpleidn (= 0.0.5) spring (= 1.3.6) diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 4db67ba94..292ccfa6a 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -1,9 +1,6 @@ require 'rails_helper' describe Account do - it { should belong_to(:registrar) } - it { should have_many(:account_activities) } - context 'with invalid attribute' do before :all do @account = Account.new diff --git a/spec/models/address_spec.rb b/spec/models/address_spec.rb index 6d8ec64ec..fe63fb38f 100644 --- a/spec/models/address_spec.rb +++ b/spec/models/address_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' describe Address do - it { should belong_to(:contact) } - context 'about class' do it 'should have versioning enabled?' do Address.paper_trail_enabled_for_model?.should == true diff --git a/spec/models/api_user_spec.rb b/spec/models/api_user_spec.rb index f159e5a7a..4b8fd9c4e 100644 --- a/spec/models/api_user_spec.rb +++ b/spec/models/api_user_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' describe ApiUser do - it { should belong_to(:registrar) } - context 'class methods' do before do Fabricate(:api_user, identity_code: '') diff --git a/spec/models/bank_statement_spec.rb b/spec/models/bank_statement_spec.rb index 281ca9568..2fa9ed19e 100644 --- a/spec/models/bank_statement_spec.rb +++ b/spec/models/bank_statement_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' describe BankStatement do - it { should have_many(:bank_transactions) } - context 'with invalid attribute' do before :all do @bank_statement = BankStatement.new diff --git a/spec/models/bank_transaction_spec.rb b/spec/models/bank_transaction_spec.rb index 06face618..27640453c 100644 --- a/spec/models/bank_transaction_spec.rb +++ b/spec/models/bank_transaction_spec.rb @@ -1,9 +1,6 @@ require 'rails_helper' describe BankTransaction do - it { should belong_to(:bank_statement) } - it { should have_one(:account_activity) } - context 'with invalid attribute' do before :all do @bank_transaction = BankTransaction.new diff --git a/spec/models/certificate_spec.rb b/spec/models/certificate_spec.rb index 232492269..74d0b460e 100644 --- a/spec/models/certificate_spec.rb +++ b/spec/models/certificate_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' describe Certificate do - it { should belong_to(:api_user) } - context 'with invalid attribute' do before :all do @certificate = Certificate.new diff --git a/spec/models/dnskey_spec.rb b/spec/models/dnskey_spec.rb index 8d1185cbd..13ad884b6 100644 --- a/spec/models/dnskey_spec.rb +++ b/spec/models/dnskey_spec.rb @@ -5,8 +5,6 @@ describe Dnskey do Fabricate(:zonefile_setting, origin: 'ee') end - it { should belong_to(:domain) } - context 'with invalid attribute' do before :all do @dnskey = Dnskey.new diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 41e29077a..51184b15e 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -9,15 +9,6 @@ describe Domain do Fabricate(:zonefile_setting, origin: 'com.ee') end - it { should belong_to(:registrar) } - it { should have_many(:nameservers) } - it { should belong_to(:registrant) } - it { should have_many(:tech_contacts) } - it { should have_many(:admin_contacts) } - it { should have_many(:domain_transfers) } - it { should have_many(:dnskeys) } - it { should have_many(:legal_documents) } - context 'with invalid attribute' do before :all do @domain = Domain.new diff --git a/spec/models/domain_transfer_spec.rb b/spec/models/domain_transfer_spec.rb index 169b9f24e..105db1d48 100644 --- a/spec/models/domain_transfer_spec.rb +++ b/spec/models/domain_transfer_spec.rb @@ -5,8 +5,6 @@ describe DomainTransfer do Fabricate(:zonefile_setting, origin: 'ee') end - it { should belong_to(:domain) } - context 'with invalid attribute' do before :all do @domain_transfer = DomainTransfer.new diff --git a/spec/models/invoice_spec.rb b/spec/models/invoice_spec.rb index b4f1d3908..33bf4fa6e 100644 --- a/spec/models/invoice_spec.rb +++ b/spec/models/invoice_spec.rb @@ -1,10 +1,6 @@ require 'rails_helper' describe Invoice do - it { should belong_to(:seller) } - it { should belong_to(:buyer) } - it { should have_many(:invoice_items) } - context 'with invalid attribute' do before :all do @invoice = Invoice.new diff --git a/spec/models/keyrelay_spec.rb b/spec/models/keyrelay_spec.rb index 372c63332..9dada32c2 100644 --- a/spec/models/keyrelay_spec.rb +++ b/spec/models/keyrelay_spec.rb @@ -5,11 +5,6 @@ describe Keyrelay do Fabricate(:zonefile_setting, origin: 'ee') end - it { should belong_to(:domain) } - it { should belong_to(:requester) } - it { should belong_to(:accepter) } - it { should have_many(:legal_documents) } - context 'with invalid attribute' do before :all do @keyrelay = Keyrelay.new diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb index d12d3e60c..ddbea285b 100644 --- a/spec/models/message_spec.rb +++ b/spec/models/message_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' describe Message do - it { should belong_to(:registrar) } - context 'with invalid attribute' do before :all do @mssage = Message.new diff --git a/spec/models/nameserver_spec.rb b/spec/models/nameserver_spec.rb index 64487722b..5971cae23 100644 --- a/spec/models/nameserver_spec.rb +++ b/spec/models/nameserver_spec.rb @@ -5,8 +5,6 @@ describe Nameserver do Fabricate(:zonefile_setting, origin: 'ee') end - it { should belong_to(:domain) } - context 'with invalid attribute' do before :all do @nameserver = Nameserver.new diff --git a/spec/models/registrar_spec.rb b/spec/models/registrar_spec.rb index e754664ac..ffe71c49a 100644 --- a/spec/models/registrar_spec.rb +++ b/spec/models/registrar_spec.rb @@ -1,11 +1,6 @@ require 'rails_helper' describe Registrar do - it { should have_many(:domains) } - it { should have_many(:api_users) } - it { should have_many(:messages) } - it { should have_many(:white_ips) } - context 'with invalid attribute' do before :all do @registrar = Registrar.new diff --git a/spec/models/white_ip_spec.rb b/spec/models/white_ip_spec.rb index 7c169c539..e824fbdd6 100644 --- a/spec/models/white_ip_spec.rb +++ b/spec/models/white_ip_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' describe WhiteIp do - it { should belong_to(:registrar) } - context 'with invalid attribute' do before :all do @white_ip = WhiteIp.new diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index fc25543f2..62470321b 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -3,7 +3,6 @@ ENV['RAILS_ENV'] ||= 'test' require 'spec_helper' require File.expand_path('../../config/environment', __FILE__) require 'rspec/rails' -require 'shoulda/matchers' require 'capybara/poltergeist' require 'paper_trail/frameworks/rspec' PaperTrail.whodunnit = 'autotest'