diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
commit | e2a03b5d20253d7a1eb10b8c110d9feec79e995f (patch) | |
tree | cc36cbb2572e549ce59388654d358cb1e2771ecd /test/unit/switchboard_entry_test.rb | |
parent | 595a48a91f8549b20109942e0b80df4f891d5999 (diff) | |
parent | 21d0843117c0962bd962fc50fccaf276a5b3067f (diff) |
Fixed a merging conflict.
Merge branch 'switchboard' into develop
Conflicts:
app/models/sip_account.rb
Diffstat (limited to 'test/unit/switchboard_entry_test.rb')
-rw-r--r-- | test/unit/switchboard_entry_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/unit/switchboard_entry_test.rb b/test/unit/switchboard_entry_test.rb new file mode 100644 index 0000000..a86c39a --- /dev/null +++ b/test/unit/switchboard_entry_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class SwitchboardEntryTest < ActiveSupport::TestCase + def test_should_be_valid + assert SwitchboardEntry.new.valid? + end +end |