[Logilogi-svn] SF.net SVN: logilogi:[1745] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1745] trunk
|
From: <wy...@us...> - 2010-06-26 12:05:31
|
Revision: 1745
http://logilogi.svn.sourceforge.net/logilogi/?rev=1745&view=rev
Author: wybow
Date: 2010-06-26 12:05:21 +0000 (Sat, 26 Jun 2010)
Log Message:
-----------
Code cleanup
Modified Paths:
--------------
trunk/app/models/user.rb
trunk/config/locales/en.yml
trunk/db/schema.rb
Added Paths:
-----------
trunk/db/migrate/20100626115750_remove_chinese_portraits.rb
trunk/public/blank.html
Removed Paths:
-------------
trunk/app/controllers/chinese_opinion_controller.rb
trunk/app/controllers/chinese_portrait_controller.rb
trunk/app/models/chinese_answer.rb
trunk/app/models/chinese_opinion.rb
trunk/app/models/chinese_portrait.rb
trunk/app/views/chinese_portrait/
trunk/app/views/layouts/_lirmm_header.html.erb
trunk/test/fixtures/chinese_answers.yml
trunk/test/fixtures/chinese_opinions.yml
trunk/test/fixtures/chinese_portraits.yml
trunk/test/functional/chinese_portrait_controller_test.rb
trunk/test/unit/chinese_answer_test.rb
trunk/test/unit/chinese_opinion_test.rb
trunk/test/unit/chinese_portrait_test.rb
Deleted: trunk/app/controllers/chinese_opinion_controller.rb
===================================================================
--- trunk/app/controllers/chinese_opinion_controller.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/controllers/chinese_opinion_controller.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,8 +0,0 @@
-class ChineseOpinionController < ApplicationController
-
- def create
- @chinese_portrait = ChinesePortrait.find( params['chinese_portrait_id'])
- @chinese_opinion = ChineseOpinion.new(:chinese_portrait => @chinese_portrait)
- end
-
-end
\ No newline at end of file
Deleted: trunk/app/controllers/chinese_portrait_controller.rb
===================================================================
--- trunk/app/controllers/chinese_portrait_controller.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/controllers/chinese_portrait_controller.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,13 +0,0 @@
-class ChinesePortraitController < ApplicationController
-
- # creates a new chinese portrait in the database
- def create
- @chinese_portrait = ChinesePortrait.new(:user => current_user)
- @chinese_portrait.chinese_answers << ChineseAnswer.new(:answer => params[:chinese_portrait][:answer_0])
- @chinese_portrait.chinese_answers << ChineseAnswer.new(:answer => params[:chinese_portrait][:answer_1])
- @chinese_portrait.chinese_answers << ChineseAnswer.new(:answer => params[:chinese_portrait][:answer_2])
- @chinese_portrait.chinese_answers << ChineseAnswer.new(:answer => params[:chinese_portrait][:answer_3])
- @chinese_portrait.chinese_answers << ChineseAnswer.new(:answer => params[:chinese_portrait][:answer_4])
- end
-
-end
Deleted: trunk/app/models/chinese_answer.rb
===================================================================
--- trunk/app/models/chinese_answer.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/models/chinese_answer.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,5 +0,0 @@
-class ChineseAnswer < ActiveRecord::Base
- ### Relationships
-
- belongs_to :chinese_portrait
-end
Deleted: trunk/app/models/chinese_opinion.rb
===================================================================
--- trunk/app/models/chinese_opinion.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/models/chinese_opinion.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,6 +0,0 @@
-class ChineseOpinion < ActiveRecord::Base
- ### Relationships
-
- belongs_to :chinese_portrait
- belongs_to :user
-end
Deleted: trunk/app/models/chinese_portrait.rb
===================================================================
--- trunk/app/models/chinese_portrait.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/models/chinese_portrait.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,11 +0,0 @@
-class ChinesePortrait < ActiveRecord::Base
- ### Relationships
-
- belongs_to :user
- has_many :chinese_answers
- has_many :chinese_opinions
-
- ### Validations
-
- validates_presence_of :user
-end
Modified: trunk/app/models/user.rb
===================================================================
--- trunk/app/models/user.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/models/user.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -48,8 +48,6 @@
has_many :invitations, :dependent => :destroy
has_many :user_groups, :through => :user_group_memberships
has_many :peer_groups, :through => :peer_group_memberships
- has_one :chinese_portrait
- has_many :chinese_opinions
### Filters
Deleted: trunk/app/views/layouts/_lirmm_header.html.erb
===================================================================
--- trunk/app/views/layouts/_lirmm_header.html.erb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/app/views/layouts/_lirmm_header.html.erb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,44 +0,0 @@
-<div id="network_bar">
- <div class="panel_content_padding">
- <%= t 'v.layouts.logi_logi_network_label' %>
- <a href="http://foundation.logilogi.org"><%= t 'v.layouts.logi_logi_foundation' %></a>
- - <b><%= GlobalConfig.domain %></b>
- <% GlobalConfig.available_subdomains.each do |l_code| %>
- <%= site_link(:text => '[' + l_code.camelcase + ']', :subdomain => l_code) %>
- <% end %>
- <%= t 'v.layouts.docs_development_list',
- :docs_open => '<a href="'," rel="nofollow">http://www.logilogi.org/pub/doc/app/">',
- :development_open => '<a href="'," rel="nofollow">http://sourceforge.net/projects/logilogi">',
- :list_open => '<a href="'," rel="nofollow">https://lists.sourceforge.net/lists/listinfo/logilogi-list">',
- :link_close => '</a>'
- </div>
-</div>
-<div id="header">
- <div id="header_content">
- <a href="/"><img src="/images/lirmm/logo.png" alt="LogiLogi book logo" /></a>
- </div>
- <div style="float:left">
- <img src="/images/header_background.png" width="6" height="68"/>
- </div>
- <div id="sessions">
- <% if current_user.anonymous? %>
- <%= link_to t('v.layouts.login'), new_user_session_url %> |
- <%= link_to t('v.layouts.'), new_user_url %>
- <% else %>
- <%= t 'v.layouts.welcome', :name => truncate(current_user.name, :length => 15) %> |
- <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
- <%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
- <%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %>
- <% end %>
- </div>
- <div id="primarytabs">
- <ul>
- <li id="primarytabs_main"><%= link_to t('v.layouts.main'), root_url %></li>
- <li id="primarytabs_logis"><%= link_to t('v.layouts.topics_and_logis'), browse_logis_url(:ll_link_string => nil) %></li>
- <li id="primarytabs_changes"><%= link_to t('v.layouts.changes'), changes_url %></li>
- <li id="primarytabs_groups"><%= link_to t('v.layouts.groups'), peer_groups_url %></li>
- <li id="primarytabs_users"><%= link_to t('v.layouts.users'), users_url %></li>
- </ul>
- </div>
- <div class="spacer"></div>
-</div>
Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/config/locales/en.yml 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,27 +1,27 @@
---
en:
activerecord:
- attributes:
- annotation:
+ attributes:
+ annotation:
message: Message
- logi:
+ logi:
body: Body
+ selection: Selection
title: Title
- selection: Selection
- peer_group:
+ peer_group:
name: Name
- remark:
+ remark:
message: Message
- user:
+ user:
email: Email
name: Name
password: Password
- password_confirmation: Password confirmation
- user_session:
+ password_confirmation: "Password confirmation"
+ user_session:
email: Email
name: Name
password: Password
- password_confirmation: Password confirmation
+ password_confirmation: "Password confirmation"
errors:
full_messages:
format: "{{attribute}} {{message}}"
@@ -51,26 +51,26 @@
header:
one: "1 error prohibited this {{model}} from being saved."
other: "{{count}} errors prohibited this {{model}} from being saved."
- models:
+ models:
annotation: comment
logi: logi
- logi_version: logi version
+ logi_version: "logi version"
remark: comment
user: user
- user_session: user session
- authlogic:
- error_messages:
- login_blank: can not be blank.
- login_not_found: is not valid.
- login_invalid: should use only letters, numbers, spaces, and .-_@ please.
- consecutive_failed_logins_limit_exceeded: Consecutive failed logins limit exceeded, account is disabled.
- email_invalid: should look like an email address.
- password_blank: can not be blank.
- password_invalid: is not valid.
- not_active: Your account is not active.
- not_confirmed: Your account is not confirmed.
- not_approved: Your account is not approved.
- no_authentication_details: You did not provide any details for authentication.
+ user_session: "user session"
+ authlogic:
+ error_messages:
+ consecutive_failed_logins_limit_exceeded: "Consecutive failed logins limit exceeded, account is disabled."
+ email_invalid: "should look like an email address."
+ login_blank: "can not be blank."
+ login_invalid: "should use only letters, numbers, spaces, and .-_@ please."
+ login_not_found: "is not valid."
+ no_authentication_details: "You did not provide any details for authentication."
+ not_active: "Your account is not active."
+ not_approved: "Your account is not approved."
+ not_confirmed: "Your account is not confirmed."
+ password_blank: "can not be blank."
+ password_invalid: "is not valid."
c:
annotations:
added: "Successfully added comment."
@@ -295,9 +295,9 @@
back: Back
blog_title_label: "Logi blog title"
cancel: Cancel
+ check_length_exeeded: "You've exceeded the maximum length by {{size}} characters!"
check_length_max: "The maximum length is {{max}} characters. You already use {{size}}."
check_length_reached: "You've reached the maximum length ({{max}})."
- check_length_exeeded: "You've exceeded the maximum length by {{size}} characters!"
click_here: "Click here."
complete: Complete
continue: Continue
@@ -309,9 +309,9 @@
error_bounds: "Score out of bounds -2, 5."
error_cannot_point: "cannot point to itself."
error_end_position_range_bigger: "End of PositionRange bigger than the logi:"
+ error_message_too_long: "Message is too long (maximum is {{max}} characters)"
error_must_start: "must start with a capital letter."
error_should_contain: "should only contain alphanumerical symbols, spaces, underscores, dots and hyphens."
- error_message_too_long: "Message is too long (maximum is {{max}} characters)"
error_tag_invalid_string: "Invalid tag string."
error_tag_reserved_words: "'Do' and 'Pub' are reserverd words."
group: Group
@@ -360,7 +360,7 @@
one: "{{count}} hour ago"
other: "{{count}} hours ago"
incoming: Incoming
- insert: Attach to phrase
+ insert: "Attach to phrase"
insert_insert: "Attach to phrase"
insert_inserting: "Attach things to a phrase."
inserting: "Currently attaching things to a phrase in this logi."
@@ -399,14 +399,14 @@
const:
bad: bad
everyone_edit: "Everyone can edit"
+ excellent: excellent
exceptional: exceptional
fair: fair
good: good
neutral: neutral
+ off_topic: "off topic"
ok: ok
- off_topic: "off topic"
owner_edit: "Only the owner can edit"
- excellent: excellent
context: ~
external_link:
html_tags_not_allowed: "html tags are not allowed inside external links."
@@ -436,8 +436,8 @@
error_too_long: "of logis cannot be this long. It has to be less than {{max}} characters. Please continue with a new logi."
error_wrong_spec: "Invalid logi specification."
logi_version:
+ error_cannot_contain_link: "cannot contain links. Add them through 'Attach to phrase'."
error_cannot_contain_tag: "cannot contain the html tag {{tag}}."
- error_cannot_contain_link: "cannot contain links. Add them through 'Attach to phrase'."
error_empty: "cannot be empty."
error_existing_record: "Tried to set text for an existing record."
error_hash: "Invalid logi_version hash given."
@@ -467,12 +467,12 @@
used_tag:
error_not_found: "UsedTag not found."
user:
+ blog_title: "A Collected Logis Blog"
+ error_capital_letter: "must start with a capital letter."
error_email_incorrect: "is incorrect, please check for typos."
error_reserved_word: "can't be a reserved word."
- error_capital_letter: "must start with a capital letter."
home_body: "This is {{name}}s user page."
home_title: "About {{name}}"
- blog_title: "A Collected Logis Blog"
user_group:
home_body: "This is the homepage of the {{name}} usergroup."
home_title: "Home of the {{name}} usergroup."
@@ -534,10 +534,10 @@
indeed_remove: "Check if these are indeed the comments you want to detach and delete. Then submit."
which_annotations: "Which comments?"
application:
- error: "Error"
- warning: "Warning"
- notice: "Notice"
are_you_sure: "Are you sure?"
+ error: Error
+ notice: Notice
+ warning: Warning
yes_delete: "Yes, delete"
changes:
at: at
@@ -614,20 +614,20 @@
link_download: "available for download"
logi_logi_foundation: "The LogiLogi Foundation"
logi_logi_network_label: "Part of the LogiLogi Network:"
- login: "Login"
+ login: Login
logout: Logout
means_available: "This means that the source code is {{link}}."
needs_javascript: "{{link}} needs Javascript enabled, and only works in {{firefox_open}}Firefox 3{{link_close}}, and in Internet Explorer 7."
new: New
preferences: Preferences
- rankings: "Rankings"
- search: "Search"
+ rankings: Rankings
+ search: Search
second_version: "The second version of LogiLogi, now in public beta."
signup: "Signup for account"
title_line: "Philosophy on-line, discuss your ideas"
user_page: "User page"
users: Users
- view: "View"
+ view: View
welcome: "Welcome {{name}}"
links:
are_you_sure: "Are you sure?"
@@ -685,11 +685,9 @@
tags: Tags
want_browsed: "Want your logi to be browsed to?"
logis:
- load_editor: "Expand reply editor"
+ add_remark: "add comment"
+ add_tag: "Add tag"
add_word_or_tag: "Add word or tag"
- add_tag: "Add tag"
- search_word_or_tag: "Search word or tag"
- add_remark: "add comment"
are_positive:
one: ", {{count}} is positive"
other: ", {{count}} are positive"
@@ -700,11 +698,11 @@
can_do_better: "Can you do better?"
can_edit: "You can edit this logi."
check: "Check:"
+ check_length_exeeded: "You've exceeded the maximum length of a logi by {{size}} characters!"
check_length_max: "The maximum length of a logi is {{max}} characters. You already use {{size}}."
check_length_reached: "You've reached the maximum length of a logi ({{max}})."
- check_length_exeeded: "You've exceeded the maximum length of a logi by {{size}} characters!"
+ clear_query: "Clear query"
clear_tags: "Clear tags"
- clear_query: "Clear query"
click_load_editor: "Tip: Click inside this box to load an editor for your logi"
commenting: "Replying logis"
comments_has:
@@ -741,6 +739,7 @@
create_new_competing_logi: "Create a new logi for these tags"
edit: "Expand editor"
enable_edit_tags: "Enable and edit its tags"
+ extras_label: "Extras: Title and Tags"
find_next_time: "Want to find it next time?"
found_for_tag_sets: "Found logis for tag sets"
found_logi: "Found the logi."
@@ -754,6 +753,7 @@
insert_into: "Attach something to phrase"
insert_or_remove: "Attach or detach?"
like_tree: "Tags are like a location in a tree, start by setting the most important tag above. If no tag is set, the 'Sandbox' tag will be used."
+ load_editor: "Expand reply editor"
new_for_tags: "Create a new logi for these tags."
newest_by_rating: "Displaying the newest logis, ordered by rating."
next: Next
@@ -773,12 +773,12 @@
related_tags_suggested: "Related tags suggested for browsing."
remark_to_author: "Short comment to author?"
remarks: Comments
+ search_word_or_tag: "Search word or tag"
select_edit: "Select whether you want to edit the text, or the settings."
select_insert_remove: "Select whether you want to attach things to phrases in the text, or detach them from the text."
+ set_a_tag: "Logi needs at least one tag"
set_tag: "Set tag"
- set_a_tag: "Logi needs at least one tag"
tags_label: "tags:"
- extras_label: "Extras: Title and Tags"
title_label: "Title:"
usergroup_label: "Usergroup:"
votes:
@@ -827,7 +827,7 @@
please_bear: "Please bear with us that LogiLogi is still in public alpha, and not everything might be working perfectly yet."
please_contact: "If you encounter any problem please contact us at {{admin_email}}."
reset_request: "A request to reset your password for {{domain}} has been made."
- sir_madam: "Sir/Madam"
+ sir_madam: Sir/Madam
user_page_is: "Your user-page on LogiLogi is:"
password_resets:
be_emailed: "Instructions to reset your password will be emailed to you."
@@ -881,7 +881,7 @@
no_recent_version: "No, always link to the most recent version."
permanent_link_label: "Permanent link:"
yes_current_version: "Yes, lock to the current/provided version."
- rankings:
+ rankings:
top_logis: "The overall top logis"
top_users: "The best authors"
ratings:
@@ -922,7 +922,6 @@
api_key: "API key"
api_key_is_label: "Your API-key is:"
change_account_settings: "You can change your account settings."
- post_new: "Post a new logi to your logi blog"
create_edit_invite_peer_groups: "Create, edit and invite people to peergroups."
created_logis_label: "Created logis:"
default_peer_group: "Default peergroup"
@@ -939,14 +938,15 @@
invite_to_peer_groups: "You can invite people to peergroups that you're a member of."
leave_blank: "Leave blank/unchanged any field you don't want to change."
link_label: "Link:"
+ new_logi: "New logi"
normal: Normal
- new_logi: "New logi"
openid_here: "If you don't have an {{explain_open}}OpenID{{link_close}} yet, you can sign up for one {{signup_open}}here{{link_close}}"
or_signup_openid: "Or signup with OpenID."
password_confirmation_label: "Password confirmation:"
password_label: "Password:"
peer_groups: Peergroups
personal_rss: "Personal RSS feed."
+ post_new: "Post a new logi to your logi blog"
select_default_peer_group: "Select your default peergroup."
set_avatar: "You can set your avatar."
settings: Settings
Added: trunk/db/migrate/20100626115750_remove_chinese_portraits.rb
===================================================================
--- trunk/db/migrate/20100626115750_remove_chinese_portraits.rb (rev 0)
+++ trunk/db/migrate/20100626115750_remove_chinese_portraits.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -0,0 +1,11 @@
+class RemoveChinesePortraits < ActiveRecord::Migration
+ def self.up
+ drop_table :chinese_answers
+ drop_table :chinese_opinions
+ drop_table :chinese_portraits
+ end
+
+ def self.down
+ raise 'No way back'
+ end
+end
Modified: trunk/db/schema.rb
===================================================================
--- trunk/db/schema.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/db/schema.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20100623093032) do
+ActiveRecord::Schema.define(:version => 20100626115750) do
create_table "acts_as_xapian_jobs", :force => true do |t|
t.string "model", :null => false
@@ -27,26 +27,6 @@
t.datetime "created_at", :null => false
end
- create_table "chinese_answers", :force => true do |t|
- t.integer "chinese_portrait_id", :null => false
- t.integer "question_nr", :null => false
- t.string "answer", :null => false
- t.datetime "created_at", :null => false
- end
-
- create_table "chinese_opinions", :force => true do |t|
- t.integer "chinese_portrait_id", :null => false
- t.integer "user_id", :null => false
- t.integer "question_nr", :null => false
- t.string "answer", :null => false
- t.datetime "created_at", :null => false
- end
-
- create_table "chinese_portraits", :force => true do |t|
- t.integer "user_id", :null => false
- t.datetime "created_at", :null => false
- end
-
create_table "commentings", :force => true do |t|
t.integer "user_id", :null => false
t.integer "from_logi_id", :null => false
@@ -68,7 +48,7 @@
t.integer "domain_levels", :null => false
t.boolean "use_language_subdomains", :null => false
t.integer "my_openid_affiliate_id", :null => false
- t.string "available_subdomains_string", :null => false
+ t.string "available_subdomains_string", :default => "", :null => false
t.integer "minimum_diff_size", :null => false
t.integer "maximum_logi_size", :null => false
t.integer "maximum_logi_version_size", :null => false
@@ -88,7 +68,7 @@
t.string "user_tag_string", :null => false
t.string "user_group_tag_string", :null => false
t.string "peer_group_tag_string", :null => false
- t.string "replace_tag_string", :null => false
+ t.string "replace_tag_string", :default => "", :null => false
t.string "sandbox_tag_string", :null => false
t.string "untagged_tag_string", :null => false
t.boolean "use_log_log", :default => false, :null => false
@@ -128,34 +108,34 @@
t.integer "to_logi_version_nr"
t.string "requested_tags_string", :limit => 120
t.string "received_tags_string", :limit => 120
- t.string "position_ranges_string", :limit => 512, :null => false
+ t.string "position_ranges_string", :limit => 512, :default => "", :null => false
t.integer "stance", :null => false
t.datetime "created_at", :null => false
t.boolean "re_resolve", :default => false, :null => false
end
create_table "logi_versions", :force => true do |t|
- t.integer "logi_id", :null => false
- t.integer "editor_user_id", :null => false
- t.integer "nr", :null => false
- t.string "position_ranges_string", :limit => 8192, :null => false
- t.datetime "created_at", :null => false
+ t.integer "logi_id", :null => false
+ t.integer "editor_user_id", :null => false
+ t.integer "nr", :null => false
+ t.string "position_ranges_string", :limit => 8192, :default => ""
+ t.datetime "created_at", :null => false
end
add_index "logi_versions", ["logi_id", "nr"], :name => "index_logi_versions_on_logi_id_and_nr", :unique => true
create_table "logis", :force => true do |t|
- t.string "perma_id", :null => false
- t.integer "user_group_id", :null => false
- t.integer "creator_user_id", :null => false
- t.text "text_stack", :null => false
+ t.string "perma_id", :null => false
+ t.integer "user_group_id", :null => false
+ t.integer "creator_user_id", :null => false
+ t.text "text_stack", :null => false
t.string "current_title", :limit => 100
- t.string "current_snippet", :limit => 300, :null => false
- t.integer "restriction", :default => 0, :null => false
- t.string "tags_string", :limit => 120, :null => false
- t.integer "visits", :default => 0, :null => false
- t.datetime "created_at", :null => false
- t.integer "kind", :null => false
+ t.string "current_snippet", :limit => 300, :null => false
+ t.integer "restriction", :default => 0, :null => false
+ t.string "tags_string", :limit => 120, :default => "", :null => false
+ t.integer "visits", :default => 0, :null => false
+ t.datetime "created_at", :null => false
+ t.integer "kind", :null => false
end
add_index "logis", ["perma_id"], :name => "index_logis_on_perma_id", :unique => true
Added: trunk/public/blank.html
===================================================================
Deleted: trunk/test/fixtures/chinese_answers.yml
===================================================================
--- trunk/test/fixtures/chinese_answers.yml 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/fixtures/chinese_answers.yml 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,40 +0,0 @@
-john_johnsons_1:
- chinese_portrait: john_johnsons
- question_nr: 1
- answer: A dog
-john_johnsons_2:
- chinese_portrait: john_johnsons
- question_nr: 2
- answer: A cat
-john_johnsons_3:
- chinese_portrait: john_johnsons
- question_nr: 3
- answer: A piano
-john_johnsons_4:
- chinese_portrait: john_johnsons
- question_nr: 4
- answer: Michael Jackson
-john_johnsons_5:
- chinese_portrait: john_johnsons
- question_nr: 5
- answer: Dagobert
-eduard_edisons_1:
- chinese_portrait: eduard_edisons
- question_nr: 1
- answer: A snake
-eduard_edisons_2:
- chinese_portrait: eduard_edisons
- question_nr: 2
- answer: A boa
-eduard_edisons_3:
- chinese_portrait: eduard_edisons
- question_nr: 3
- answer: A guitar
-eduard_edisons_4:
- chinese_portrait: eduard_edisons
- question_nr: 4
- answer: A gorilla
-eduard_edisons_5:
- chinese_portrait: eduard_edisons
- question_nr: 5
- answer: A rocket
Deleted: trunk/test/fixtures/chinese_opinions.yml
===================================================================
--- trunk/test/fixtures/chinese_opinions.yml 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/fixtures/chinese_opinions.yml 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,12 +0,0 @@
-john_johnsons_opinion_on_eduard_edison:
- chinese_portrait: eduard_edisons
- user: john_johnson
- question_nr: 1
- answer: A dog
- created_at: <%= 10.days.ago.to_s(:db) %>
-eduard_edisons_opinion_on_john_johnson:
- chinese_portrait: john_johnsons
- user: eduard_edison
- question_nr: 1
- answer: An eagle
- created_at: <%= 10.days.ago.to_s(:db) %>
Deleted: trunk/test/fixtures/chinese_portraits.yml
===================================================================
--- trunk/test/fixtures/chinese_portraits.yml 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/fixtures/chinese_portraits.yml 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,6 +0,0 @@
-eduard_edisons:
- user: eduard_edison
- created_at: <%= 10.days.ago.to_s(:db) %>
-john_johnsons:
- user: john_johnson
- created_at: <%= 10.days.ago.to_s(:db) %>
Deleted: trunk/test/functional/chinese_portrait_controller_test.rb
===================================================================
--- trunk/test/functional/chinese_portrait_controller_test.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/functional/chinese_portrait_controller_test.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class ChinesePortraitControllerTest < ActionController::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
-end
Deleted: trunk/test/unit/chinese_answer_test.rb
===================================================================
--- trunk/test/unit/chinese_answer_test.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/unit/chinese_answer_test.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class ChineseAnswerTest < ActiveSupport::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
-end
Deleted: trunk/test/unit/chinese_opinion_test.rb
===================================================================
--- trunk/test/unit/chinese_opinion_test.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/unit/chinese_opinion_test.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class ChineseOpinionTest < ActiveSupport::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
-end
Deleted: trunk/test/unit/chinese_portrait_test.rb
===================================================================
--- trunk/test/unit/chinese_portrait_test.rb 2010-06-26 11:07:03 UTC (rev 1744)
+++ trunk/test/unit/chinese_portrait_test.rb 2010-06-26 12:05:21 UTC (rev 1745)
@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class ChinesePortraitTest < ActiveSupport::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
-end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|