← Back to branch summary

~rvb/maas/dj-migrations

~rvb/maas/dj-migrations

« back to all changes in this revision

Viewing changes to src/maasserver/static/js/angular/factories/tests/test_devices.js

Committer: Raphael Badin
Date: 2015-03-13 15:22:22 UTC
mfrom: (3631.1.15 maas)
Revision ID: raphael.badin@canonical.com-20150313152222-nhq1vs6hop1ooq7e

Merge trunk.

files added:
src/maasserver/models/filesystem.py

src/maasserver/models/filesystemgroup.py

src/maasserver/models/partition.py

src/maasserver/models/partitiontable.py

src/maasserver/models/tests/test_filesystem.py

src/maasserver/models/tests/test_filesystemgroup.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_virtualblockdevice.py

src/maasserver/models/virtualblockdevice.py

src/maasserver/south_migrations/0129_add_partition_table_model.py

src/maasserver/south_migrations/0130_add_partition_model.py

src/maasserver/south_migrations/0131_add_filesystem_model.py

src/maasserver/south_migrations/0132_add_filesystem_group_model.py

src/maasserver/south_migrations/0133_add_virtual_block_device_model.py

src/maasserver/testing/config.py

src/maastesting/djangoclient.py

files modified:
required-packages/base

src/maascli/parser.py

src/maascli/tests/test_parser.py

src/maasserver/api/devices.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/api/tests/test_commissioning.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_licensekey.py

src/maasserver/api/tests/test_network.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodegroup.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_tag.py

src/maasserver/api/tests/test_zone.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/models/__init__.py

src/maasserver/models/macaddress.py

src/maasserver/models/node.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/plugin.py

src/maasserver/static/js/angular/factories/devices.js

src/maasserver/static/js/angular/factories/nodes.js

src/maasserver/static/js/angular/factories/tests/test_devices.js

src/maasserver/static/js/angular/factories/tests/test_nodes.js

src/maasserver/static/js/angular/services/manager.js

src/maasserver/static/js/angular/services/tests/test_manager.js

src/maasserver/static/js/tests/test_image_views.html

src/maasserver/static/js/tests/test_node_views.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/testing/factory.py

src/maasserver/testing/oauthclient.py

src/maasserver/testing/testcase.py

src/maastesting/djangotestcase.py

src/provisioningserver/testing/config.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maasserver/static/js/angular/factories/tests/test_devices.js

46

46

expect(DevicesManager._activeDevice).toBeNull();

47

47

expect(DevicesManager._pk).toBe("system_id");

48

48

expect(DevicesManager._handler).toBe("device");

49

expect(DevicesManager._metadataAttributes).toEqual(["owner"]);

49

expect(DevicesManager._metadataAttributes).toEqual(["owner", "tags"]);

50

50

});

51

51

52

52

describe("getActiveDevice", function() {

Older »