Use CanCanCan for nodes, ways, relations, old and api controllers

[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..8e5b21aff7c55500b376644bf7db16218e03fe03 100644 (file)
--- a/test/models/client_application_test.rb
+++ b/test/models/client_application_test.rb
@@ -1,22 +1,20 @@
 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|
-      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 = client_applications(:normal_user_app)
+      app = build(:client_application)
       app.url = url
-      assert !app.valid?, "#{url} is valid when it shouldn't be"
+      assert_not app.valid?, "#{url} is valid when it shouldn't be"
     end
   end
 
@@ -25,15 +23,15 @@ class ClientApplicationTest < ActiveSupport::TestCase
     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 = client_applications(:normal_user_app)
+      app = build(:client_application)
       app.support_url = url
-      assert !app.valid?, "#{url} is valid when it shouldn't be"
+      assert_not app.valid?, "#{url} is valid when it shouldn't be"
     end
   end
 
@@ -42,15 +40,15 @@ class ClientApplicationTest < ActiveSupport::TestCase
     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 = client_applications(:normal_user_app)
+      app = build(:client_application)
       app.callback_url = url
-      assert !app.valid?, "#{url} is valid when it shouldn't be"
+      assert_not app.valid?, "#{url} is valid when it shouldn't be"
     end
   end
 end