[mb-commits] branch, beta, updated. Fix Controller::ReleaseGroup::Edit tests to correctly identify the edit

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=80d58393115ec5f209b7faa75e7986d43e2dd1e1 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5944af368654bcdc0bca21b18ce512819bf776d3 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f11685d74fbce76b304249c5b242b40cea08356a (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b7a19b2d7b33c3f0f8fb18525e5b7118ff9d704b (commit)

Summary of changes:
 .../MusicBrainz/Server/Controller/CDStub/Browse.pm |    4 ++--
 .../Server/Controller/ReleaseGroup/Edit.pm         |    2 +-
 t/lib/t/MusicBrainz/Server/Track.pm                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 80d58393115ec5f209b7faa75e7986d43e2dd1e1
Author: Oliver Charles <[email protected]>
Date:   Thu Feb 7 17:16:41 2013 +0000

    Fix Controller::ReleaseGroup::Edit tests to correctly identify the edit

diff --git a/t/lib/t/MusicBrainz/Server/Controller/ReleaseGroup/Edit.pm b/t/lib/t/MusicBrainz/Server/Controller/ReleaseGroup/Edit.pm
index c257ec6..9e53a2c 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/ReleaseGroup/Edit.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/ReleaseGroup/Edit.pm
@@ -40,7 +40,7 @@ is_deeply($edit->data, {
             names => [ {
                 artist => { id => 3, name => 'Bar' },
                 name => 'Foo',
-                join_phrase => undef,
+                join_phrase => '',
             } ]
         },
         name => 'Another name',

commit 5944af368654bcdc0bca21b18ce512819bf776d3
Author: Oliver Charles <[email protected]>
Date:   Thu Feb 7 17:10:33 2013 +0000

    Do not check for &#xa0; entity in CDStub::Browse test

diff --git a/t/lib/t/MusicBrainz/Server/Controller/CDStub/Browse.pm b/t/lib/t/MusicBrainz/Server/Controller/CDStub/Browse.pm
index 744ae50..f0b3efd 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/CDStub/Browse.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/CDStub/Browse.pm
@@ -34,8 +34,8 @@ html_ok($mech->content);
 $mech->title_like(qr/Top CD Stubs/, 'title is correct');
 $mech->content_like(qr/Test Artist/, 'content has artist name');
 $mech->content_like(qr/YfSgiOEayqN77Irs.VNV.UNJ0Zs-/, 'content has disc id');
-$mech->content_like(qr/Added 13&#xa0;years ago/, 'content has added timestamp');
-$mech->content_like(qr/last modified 12&#xa0;years ago/, 'content has last modified timestamp');
+$mech->content_like(qr/Added 13 years ago/, 'content has added timestamp');
+$mech->content_like(qr/last modified 12 years ago/, 'content has last modified timestamp');
 
 };
 

commit f11685d74fbce76b304249c5b242b40cea08356a
Author: Oliver Charles <[email protected]>
Date:   Thu Feb 7 17:05:34 2013 +0000

    Fix format_track_length test to correctly check for hours, not days

diff --git a/t/lib/t/MusicBrainz/Server/Track.pm b/t/lib/t/MusicBrainz/Server/Track.pm
index 8986caf..8fa1f49 100644
--- a/t/lib/t/MusicBrainz/Server/Track.pm
+++ b/t/lib/t/MusicBrainz/Server/Track.pm
@@ -21,7 +21,7 @@ test 'Format Track Length' => sub {
     is (format_track_length ('432'), '432 ms', 'Short track');
     is (format_track_length ('9000'), '0:09', 'Short track');
     is (format_track_length ('1820000'), '30:20', 'Medium track');
-    is (format_track_length ('181100000'), '2:18:20', 'Long track');
+    is (format_track_length ('181100000'), '50:18:20', 'Long track');
 };
 
 test 'Unformat Track Length' => sub {

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server