Permalink
Browse files

Conflicts resolved

  • Loading branch information...
2 parents 165ba0d + b5dd9bb commit fb2691bc70fab4b6288c554736fe4997328776c2 DanielVartanov committed Sep 22, 2010
View
7 Rakefile
@@ -1,4 +1,9 @@
-conrequire 'rake'
+require 'rake'
+require 'spec/rake/spectask'
+
+Spec::Rake::SpecTask.new(:spec) do |t|
+ t.spec_files = Dir.glob('spec/**/*_spec.rb')
+end
begin
require 'jeweler'
View
2 spec/class_stubs/address.rb
@@ -1,3 +1,5 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
class Address < SData::Resource
def self.descends_from_active_record?
View
22 spec/controller_mixin/controller_mixin_spec.rb
@@ -1,22 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-
-include SData
-
-describe ControllerMixin do
- describe "given a class which behaves like ActionController::Base" do
- before :all do
- Base = Class.new(ActionController::Base)
- end
-
- describe "when SData::ControllerMixin is included" do
- before :each do
- Base.extend ControllerMixin
- end
-
- it "class should respond to .acts_as_sdata" do
- Base.should respond_to(:acts_as_sdata)
- Base.new.should_not respond_to(:acts_as_sdata)
- end
- end
- end
-end
View
2 spec/payload_map/payload_map_spec.rb
@@ -4,8 +4,6 @@
context "given sdata model class extended by SData::PayloadMap" do
before :all do
class TradingAccount < SData::Resource
-# extend SData::PayloadMap
-#
define_payload_map :foo => { :static_value => :bar }
# temporary
View
1 spec/spec.opts
@@ -1,4 +1,3 @@
---colour
--format nested
--loadby mtime
--reverse
View
4 spec/sync_controller_mixin/sdata_collection_sync_feed_spec.rb
@@ -2,7 +2,7 @@
include SData::Sync
-describe ControllerMixin, "#sdata_collection_sync_feed" do
+describe SData::ControllerMixin, "#sdata_collection_sync_feed" do
class BaseClass
attr_accessor :status
@@ -27,7 +27,7 @@ class VirtualModel < SData::Resource
before :all do
VirtualModel.stub :baze_class => BaseClass
Base = Class.new(ActionController::Base)
- Base.extend ControllerMixin
+ Base.extend SData::ControllerMixin
Base.acts_as_sdata :model => VirtualModel
Base.syncs_sdata
VirtualModel.acts_as_sdata

0 comments on commit fb2691b

Please sign in to comment.