Skip to content

Commit

Permalink
rake tasks nicely failing
Browse files Browse the repository at this point in the history
  • Loading branch information
jywarren committed Apr 4, 2013
1 parent 058dfba commit 095eac5
Show file tree
Hide file tree
Showing 14 changed files with 76 additions and 34 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ config/initializers/recaptcha.rb
config/config.yml
config/initializers/site_keys.rb
Gemfile.lock
/public/system*
2 changes: 1 addition & 1 deletion app/models/drupal_main_image.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class DrupalMainImage < ActiveRecord::Base

self.table_name 'content_field_main_image'
self.table_name = 'content_field_main_image'
self.primary_key = 'vid'

belongs_to :drupal_node, :foreign_key => 'vid'
Expand Down
1 change: 1 addition & 0 deletions public/bookmarklet.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified public/favicon.ico
Binary file not shown.
11 changes: 0 additions & 11 deletions test/fixtures/drupal_nodes.yml

This file was deleted.

20 changes: 20 additions & 0 deletions test/fixtures/node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html

one:
title: "Canon A1200 IR conversion at PLOTS Barnraising at LUMCON"
created: 1362353067
changed: 1362354920
status: 1
type: "note"
uid: 2
nid: 1
# this needs a drupal_node_revision and other crap

two:
title: "about"
created: 1362353067
changed: 1362354920
status: 1
type: "page"
uid: 1
nid: 2
9 changes: 9 additions & 0 deletions test/fixtures/rusers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
one:
username: warren
email: [email protected]
#password: lalala

two:
username: jeff
email: [email protected]
#password: lalala
9 changes: 0 additions & 9 deletions test/fixtures/users.yml

This file was deleted.

21 changes: 21 additions & 0 deletions test/integration/public_pages_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
require 'test_helper'

class PublicPagesTest < ActionDispatch::IntegrationTest
# we need some fixtures yo!

test "browse front page" do
get "/"
assert_response :success
end

test "browse /research" do
get "/research"
assert_response :success
end

test "browse /about" do
get "/about"
assert_response :success
end

end
13 changes: 0 additions & 13 deletions test/unit/comment_test.rb

This file was deleted.

14 changes: 14 additions & 0 deletions test/unit/drupal_comment_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
require 'test_helper'

class DrupalCommentTest < ActiveSupport::TestCase

test 'new_comment_should_be_valid' do
assert DrupalComment.new.valid?
end

#test "should not save comment without body" do
# note = DrupalNode.new
# assert !note.save, "Saved the comment without body text"
#end

end
7 changes: 7 additions & 0 deletions test/unit/drupal_node_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
require 'test_helper'

class DrupalNodeTest < ActiveSupport::TestCase

# test "the truth" do
# assert true
# end

test "should not save node without title, or anything else" do
node = DrupalNode.new
assert !node.save
end

end
2 changes: 2 additions & 0 deletions test/unit/user_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
require 'test_helper'

class UserTest < ActiveSupport::TestCase

def test_should_be_valid
assert User.new.valid?
end

end
Empty file removed vendor/plugins/.gitkeep
Empty file.

0 comments on commit 095eac5

Please sign in to comment.