From 8c51eb31db3b95a749acac99065e89464c302a99 Mon Sep 17 00:00:00 2001 From: jam Date: Wed, 8 Jan 2014 01:42:59 +0000 Subject: [PATCH] Fix test and make sure icecast is at the bottom of the sql command chain --- db/up/icecast.sql | 10 +++++----- .../models/icecast_admin_authentication_spec.rb | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/db/up/icecast.sql b/db/up/icecast.sql index 8ad8c84b7..b167890ac 100644 --- a/db/up/icecast.sql +++ b/db/up/icecast.sql @@ -42,16 +42,16 @@ create table icecast_admin_authentications ( -- The default username for all source connections is 'source' but -- this option allows to specify a default password. This and the username -- can be changed in the individual mount sections. - source_password character NOT NULL DEFAULT 'icejam321', + source_password VARCHAR NOT NULL DEFAULT 'icejam321', -- Used in the master server as part of the authentication when a slave requests -- the list of streams to relay. The default username is 'relay' - relay_user character NOT NULL DEFAULT 'relay', - relay_password character NOT NULL DEFAULT 'jkrelayhack', + relay_user VARCHAR NOT NULL DEFAULT 'relay', + relay_password VARCHAR NOT NULL DEFAULT 'jkrelayhack', --The username/password used for all administration functions. - admin_user character NOT NULL DEFAULT 'jkadmin', - admin_password character NOT NULL DEFAULT 'jKadmin123', + admin_user VARCHAR NOT NULL DEFAULT 'jkadmin', + admin_password VARCHAR NOT NULL DEFAULT 'jKadmin123', created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP diff --git a/ruby/spec/jam_ruby/models/icecast_admin_authentication_spec.rb b/ruby/spec/jam_ruby/models/icecast_admin_authentication_spec.rb index cb29bfb86..d5cd83588 100644 --- a/ruby/spec/jam_ruby/models/icecast_admin_authentication_spec.rb +++ b/ruby/spec/jam_ruby/models/icecast_admin_authentication_spec.rb @@ -12,9 +12,4 @@ describe IcecastAdminAuthentication do admin.save.should be_true end - it "non-string password should be checked" do - admin.source_password = 1 - admin.save.should be_false - admin.errors[:source_password].should == ['is not a string'] - end end