github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship

Browse Source
This commit is contained in:
did 2012-02-27 03:48:06 -08:00
parent c6e1276974
commit 520b68104b
10 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -41,4 +41,5 @@ spec/dummy/public/sites
/spec/dummy/tmp/**/*
app/assets/javascripts/old/
app/assets/stylesheets/old/
.rbenv-gemsets

39
Gemfile.lock
View File

@ -1,10 +1,9 @@
GIT
remote: git://github.com/Compass/compass-rails.git
revision: c2d47fb846b6fd48272e56ef21ea91fab8fc8510
revision: 47d889ad8dabdab1e9f44da4447f94846c089c50
specs:
compass-rails (1.0.0.rc.1)
compass-rails (1.0.0.rc.3)
compass (~> 0.12.rc.0)
rails
GIT
remote: git://github.com/chriseppstein/compass.git
@ -94,8 +93,8 @@ GEM
activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
arel (3.0.0)
addressable (2.2.7)
arel (3.0.1)
bcrypt-ruby (3.0.1)
bson (1.5.2)
bson_ext (1.5.2)
@ -114,10 +113,10 @@ GEM
carrierwave-mongoid (0.1.3)
carrierwave (>= 0.5.6)
mongoid (~> 2.1)
cells (3.8.0)
cells (3.8.2)
actionpack (~> 3.0)
railties (~> 3.0)
childprocess (0.3.0)
childprocess (0.3.1)
ffi (~> 1.0.6)
chunky_png (1.2.5)
codemirror-rails (2.21.1)
@ -129,15 +128,15 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
cucumber (1.1.4)
cucumber (1.1.8)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.7.1)
gherkin (~> 2.8.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (1.2.1)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
database_cleaner (0.7.1)
devise (1.5.3)
@ -158,7 +157,7 @@ GEM
factory_girl (~> 2.5.0)
railties (>= 3.0.0)
ffi (1.0.11)
flash_cookie_session (1.1.1)
flash_cookie_session (1.1.2)
rails (~> 3.0)
fog (1.1.2)
builder
@ -174,7 +173,7 @@ GEM
formtastic (2.0.2)
rails (~> 3.0)
fssm (0.2.8.1)
gherkin (2.7.6)
gherkin (2.8.0)
json (>= 1.4.6)
haml (3.1.4)
highline (1.6.11)
@ -183,7 +182,7 @@ GEM
multi_json
multi_xml
i18n (0.6.0)
journey (1.0.1)
journey (1.0.2)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
@ -211,7 +210,7 @@ GEM
mocha (0.9.12)
mongo (1.5.2)
bson (= 1.5.2)
mongoid (2.4.3)
mongoid (2.4.4)
activemodel (~> 3.1)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
@ -219,7 +218,7 @@ GEM
multi_xml (0.4.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.2.2)
net-ssh (2.3.0)
nokogiri (1.5.0)
orm_adapter (0.0.6)
pickle (0.4.10)
@ -276,15 +275,15 @@ GEM
railties (>= 3.0)
rspec (~> 2.8.0)
ruby-hmac (0.4.0)
rubyzip (0.9.5)
rubyzip (0.9.6.1)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.1.12)
sass (3.1.15)
sass-rails (3.2.4)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.18.0)
selenium-webdriver (2.19.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
@ -308,7 +307,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
warden (1.1.0)
warden (1.1.1)
rack (>= 1.0)
xpath (0.1.4)
nokogiri (~> 1.3)

2
app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee
View File

@ -81,6 +81,8 @@ class Locomotive.Views.Shared.Fields.HasManyView extends Backbone.View
update_entry: (entry) ->
entry_html = $(_.detect @$('> ul > li'), (_entry_html) -> $(_entry_html).data('data-entry-id') == entry.id)
@collection.get(entry.id).set(entry.attributes) # sync
new_entry_html = $(@entry_template()(label: entry.get('_label')))
new_entry_html.data('data-entry-id', entry.id)

2
app/models/locomotive/theme_asset.rb
View File

@ -16,7 +16,7 @@ module Locomotive
mount_uploader :source, ThemeAssetUploader, :mount_on => :source_filename
## associations ##
referenced_in :site, :class_name => 'Locomotive::Site'
belongs_to :site, :class_name => 'Locomotive::Site'
## indexes ##
index :site_id

2
config/locales/admin_ui.en.yml
View File

@ -94,7 +94,7 @@ en:
sessions:
new:
title: Login
title: Log in
link: "I forgot my password"
email: "Email"
password: "Password"

2
features/backoffice/login.feature
View File

@ -1,4 +1,4 @@
Feature: Login
Feature: Log in
In order to access locomotive admin panel
As an administrator
I want to log in

4
features/backoffice/pages.feature
View File

@ -27,8 +27,8 @@ Scenario: Creating a valid page
Scenario: Updating a valid page
When I go to pages
And I follow "Home page"
And I change the page title with "Home page !"
And I change the page template with "My new content is here"
And I change the page title to "Home page !"
And I change the page template to "My new content is here"
And I press "Save"
Then I should see "Page was successfully updated."
And I should have "My new content is here" in the index page

19
features/backoffice/theme_assets.feature
View File

@ -30,10 +30,11 @@ Scenario: Uploading a stylesheet
And I should see "Code"
And I should see "stylesheets/main.css"
@javascript
Scenario: Updating a stylesheet
Given a stylesheet asset named "application"
When I go to theme assets
And I follow "stylesheets/application.css"
And I follow "application.css"
And I fill in "theme_asset[plain_text]" with "Lorem ipsum (updated)"
And I press "Save"
Then I should see "File was successfully updated."
@ -51,13 +52,15 @@ Scenario: Uploading a javascript
And I should see "Code"
And I should see "javascripts/test/application.js"
Scenario: Updating a javascript
Given a javascript asset named "application"
When I go to theme assets
And I follow "javascripts/application.js"
And I fill in "theme_asset[plain_text]" with "Lorem ipsum (updated)"
And I press "Save"
Then I should see "File was successfully updated."
# @javascript
# Scenario: Updating a javascript
# Given a javascript asset named "application"
# When I go to theme assets
# And I follow "application.js"
# And I change the asset code with
# And I fill in "theme_asset[plain_text]" with "Lorem ipsum (updated)"
# And I press "Save"
# Then I should see "File was successfully updated."
Scenario: Uploading an image which already exists
When I go to theme assets

4
features/step_definitions/page_steps.rb
View File

@ -18,13 +18,13 @@ Given /^a page named "([^"]*)" with the template:$/ do |page_slug, template|
end
# change the title
When /^I change the page title with "([^"]*)"$/ do |page_title|
When /^I change the page title to "([^"]*)"$/ do |page_title|
page.evaluate_script "window.prompt = function() { return '#{page_title}'; }"
page.find('h2 a.editable').click
end
# change the template
When /^I change the page template with "([^"]*)"$/ do |page_template|
When /^I change the page template to "([^"]*)"$/ do |page_template|
page.evaluate_script "window.application_view.view.model.set({ 'raw_template': '#{page_template}' })"
end

18
features/step_definitions/theme_asset_steps.rb
View File

@ -3,15 +3,15 @@
# helps create a theme asset
def create_plain_text_asset(name, type)
asset = FactoryGirl.build(:theme_asset, {
:site => @site,
:plain_text_name => name,
:plain_text => 'Lorem ipsum',
:plain_text_type => type,
:performing_plain_text => true
:site => @site,
:plain_text_name => name,
:plain_text => 'Lorem ipsum',
:plain_text_type => type,
:performing_plain_text => true
})
# asset.should be_valid
asset.save!
end
# creates various theme assets
@ -33,6 +33,12 @@ end
# other stuff
# change the template
# When /^I change the theme asset code to "([^"]*)"$/ do |page_template|
# page.evaluate_script "window.application_view.view.model.set({ 'raw_template': '#{page_template}' })"
# end
Then /^I should see "([^"]*)" as theme asset code$/ do |code|
find(:css, "#theme_asset_plain_text").text.should == code
end