Merge remote-tracking branch 'upstream/pull/1580'

[rails.git] / test / models / client_application_test.rb

diff --git a/test/models/client_application_test.rb b/test/models/client_application_test.rb
index 604a5de3361df53b8fe154acde5aa2544067bfeb..9684513c42e74ae400b14447fb296049f6d584c6 100644 (file)
--- a/test/models/client_application_test.rb
+++ b/test/models/client_application_test.rb
@@ -1,20 +1,18 @@
 require "test_helper"
 
 class ClientApplicationTest < ActiveSupport::TestCase
 require "test_helper"
 
 class ClientApplicationTest < ActiveSupport::TestCase

-  fixtures :client_applications
-

   def test_url_valid
     ok = ["http://example.com/test", "https://example.com/test"]
     bad = ["", "ftp://example.com/test", "myapp://somewhere"]
 
     ok.each do |url|
   def test_url_valid
     ok = ["http://example.com/test", "https://example.com/test"]
     bad = ["", "ftp://example.com/test", "myapp://somewhere"]
 
     ok.each do |url|

-      app = client_applications(:normal_user_app).dup
+      app = build(:client_application)

       app.url = url
       assert app.valid?, "#{url} is invalid, when it should be"
     end
 
     bad.each do |url|
       app.url = url
       assert app.valid?, "#{url} is invalid, when it should be"
     end
 
     bad.each do |url|

-      app = client_applications(:normal_user_app)
+      app = build(:client_application)

       app.url = url
       assert !app.valid?, "#{url} is valid when it shouldn't be"
     end
       app.url = url
       assert !app.valid?, "#{url} is valid when it shouldn't be"
     end


@@ -25,13 +23,13 @@ class ClientApplicationTest < ActiveSupport::TestCase
     bad = ["ftp://example.com/test", "myapp://somewhere", "gibberish"]
 
     ok.each do |url|
     bad = ["ftp://example.com/test", "myapp://somewhere", "gibberish"]
 
     ok.each do |url|

-      app = client_applications(:normal_user_app)
+      app = build(:client_application)

       app.support_url = url
       assert app.valid?, "#{url} is invalid, when it should be"
     end
 
     bad.each do |url|
       app.support_url = url
       assert app.valid?, "#{url} is invalid, when it should be"
     end
 
     bad.each do |url|

-      app = client_applications(:normal_user_app)
+      app = build(:client_application)

       app.support_url = url
       assert !app.valid?, "#{url} is valid when it shouldn't be"
     end
       app.support_url = url
       assert !app.valid?, "#{url} is valid when it shouldn't be"
     end


@@ -42,13 +40,13 @@ class ClientApplicationTest < ActiveSupport::TestCase
     bad = ["gibberish"]
 
     ok.each do |url|
     bad = ["gibberish"]
 
     ok.each do |url|

-      app = client_applications(:normal_user_app)
+      app = build(:client_application)

       app.callback_url = url
       assert app.valid?, "#{url} is invalid, when it should be"
     end
 
     bad.each do |url|
       app.callback_url = url
       assert app.valid?, "#{url} is invalid, when it should be"
     end
 
     bad.each do |url|

-      app = client_applications(:normal_user_app)
+      app = build(:client_application)

       app.callback_url = url
       assert !app.valid?, "#{url} is valid when it shouldn't be"
     end
       app.callback_url = url
       assert !app.valid?, "#{url} is valid when it shouldn't be"
     end