diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-11-09 15:07:56 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-11-09 15:07:56 -0800 |
commit | 049caa9e5a38ed8274a3d40a8b934012a87b464f (patch) | |
tree | f9d346387343f2c4b5241d2d7296993cbb47ed43 /activerecord/test/fixtures | |
parent | 47704af54d51b240f733c596ebb39a033aa698cd (diff) | |
parent | f43f56e16e99dae083cf1400a48c236d1af265d4 (diff) | |
download | rails-049caa9e5a38ed8274a3d40a8b934012a87b464f.tar.gz rails-049caa9e5a38ed8274a3d40a8b934012a87b464f.tar.bz2 rails-049caa9e5a38ed8274a3d40a8b934012a87b464f.zip |
Merge pull request #17217 from codeodor/fix-17119
Ensure HABTM relationships produce valid class names (Fixes #17119)
Diffstat (limited to 'activerecord/test/fixtures')
-rw-r--r-- | activerecord/test/fixtures/computers.yml | 5 | ||||
-rw-r--r-- | activerecord/test/fixtures/developers.yml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/computers.yml b/activerecord/test/fixtures/computers.yml index 7281a4d768..ad5ae2ec71 100644 --- a/activerecord/test/fixtures/computers.yml +++ b/activerecord/test/fixtures/computers.yml @@ -3,3 +3,8 @@ workstation: system: 'Linux' developer: 1 extendedWarranty: 1 + +laptop: + system: 'MacOS 1' + developer: 1 + extendedWarranty: 1 diff --git a/activerecord/test/fixtures/developers.yml b/activerecord/test/fixtures/developers.yml index 1a74563dc6..54b74e7a74 100644 --- a/activerecord/test/fixtures/developers.yml +++ b/activerecord/test/fixtures/developers.yml @@ -2,6 +2,7 @@ david: id: 1 name: David salary: 80000 + shared_computers: laptop jamis: id: 2 |