Merge branch 'master' into rspec

spec/models/admin_user_spec.rb

@@ -16,16 +16,6 @@ RSpec.describe AdminUser do
       @admin_user = Fabricate(:admin_user)
     end
 
-    it 'should have one version' do
-      with_versioning do
-        @admin_user.versions.should == []
-        @admin_user.updated_at = Time.zone.now
-        @admin_user.save
-        @admin_user.errors.full_messages.should match_array([])
-        @admin_user.versions.size.should == 1
-      end
-    end
-
     it 'should require password confirmation when changing password' do
       @admin_user.valid?.should == true
       @admin_user.password = 'not confirmed'
@@ -39,10 +29,4 @@ RSpec.describe AdminUser do
       expect(described_class.min_password_length).to eq(8)
     end
   end
-
-  describe '#min_password_length' do
-    it 'returns minimum password length' do
-      expect(described_class.min_password_length).to eq(8)
-    end
-  end
 end

spec/requests/admin/registrars/create_spec.rb

@@ -17,6 +17,16 @@ RSpec.describe 'admin registrar create' do
     expect(registrar.website).to eq('test')
   end
 
+  it 'saves email' do
+    post admin_registrars_path, { registrar: attributes_for(:registrar, email: 'test@test.com') }
+    expect(registrar.email).to eq('test@test.com')
+  end
+
+  it 'saves billing email' do
+    post admin_registrars_path, { registrar: attributes_for(:registrar, billing_email: 'test@test.com') }
+    expect(registrar.billing_email).to eq('test@test.com')
+  end
+
   it 'redirects to :show' do
     post admin_registrars_path, { registrar: attributes_for(:registrar) }
     expect(response).to redirect_to admin_registrar_path(registrar)

spec/requests/admin/registrars/update_spec.rb

@@ -14,6 +14,24 @@ RSpec.describe 'admin registrar update' do
     expect(registrar.website).to eq('new-website')
   end
 
+  it 'updates email' do
+    registrar = create(:registrar, email: 'test@test.com')
+
+    patch admin_registrar_path(registrar), registrar: attributes_for(:registrar, email: 'new-test@test.com')
+    registrar.reload
+
+    expect(registrar.email).to eq('new-test@test.com')
+  end
+
+  it 'updates billing email' do
+    registrar = create(:registrar, billing_email: 'test@test.com')
+
+    patch admin_registrar_path(registrar), registrar: attributes_for(:registrar, billing_email: 'new-test@test.com')
+    registrar.reload
+
+    expect(registrar.billing_email).to eq('new-test@test.com')
+  end
+
   it 'redirects to :show' do
     registrar = create(:registrar)
 

spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require 'webmock/rspec'
+require 'simplecov'
+SimpleCov.start
+
 
 RSpec.configure do |config|
   # https://github.com/rspec/rspec-rails/issues/1076