rhoconnect 3.1.2 → 3.2.0.beta1

data/spec/javascripts/home_view_spec.js

@@ -0,0 +1,39 @@
+describe("Home", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    source = new Source();
+	
+		sinon.stub(source,'fetch')
+		sinon.stub(source,'save');
+	
+		this.homeView = new App.Views.Home({model : source});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+	});
+	
+	it("should have render initial html",function(){
+		this.indexRenderSpy = sinon.spy(this.homeView,'render');
+			
+		this.homeView.render();
+		expect(this.indexRenderSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should have correct html rendered ",function(){
+		var title = this.homeView.el.innerHTML.search('Home');
+		expect(title).toBeGreaterThan(0);
+		
+		var change_btn = this.homeView.el.innerHTML.search('Change Admin Password');
+		expect(change_btn).toBeGreaterThan(0);
+		
+		var reset = this.homeView.el.innerHTML.search('Reset');
+		expect(reset).toBeGreaterThan(0);
+		
+	})
+});

data/spec/javascripts/index_view_spec.js

@@ -0,0 +1,42 @@
+describe("Index", function(){
+	
+	beforeEach(function(){
+		this.indexView = new App.Views.Index;	
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+	})
+	
+	it("should have render initial html",function(){
+		this.indexRenderSpy = sinon.spy(this.indexView,'render');
+		this.indexView.render();
+		expect(this.indexRenderSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should call login and set auth",function(){
+		this.indexLoginSpy = sinon.spy(this.indexView,'login')
+		var stub = sinon.stub(jQuery,'ajax').yieldsTo("success","testtoken");
+		function myevent(){
+			this.preventDefault=function(){return true;}
+		}
+		e = new myevent();
+		this.indexView.login(e);
+		
+		var session = new Session();
+		expect(session.getAuthenticated()).toEqual('true')
+		expect(session.getApiKey()).toEqual('testtoken')
+		jQuery.ajax.restore();
+	});
+	
+	it("should have correct html rendered",function(){
+		var login = this.indexView.el.innerHTML.search('Login');
+		expect(login).toBeGreaterThan(0);
+		
+		var password = this.indexView.el.innerHTML.search('Password');
+		expect(password).toBeGreaterThan(0);	
+	})
+	
+});

data/spec/javascripts/new_ping_view_spec.js

@@ -0,0 +1,48 @@
+describe("NewPingView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+	});
+	
+	it("should have render initial html with name",function(){
+		sinon.stub(jQuery,'ajax');
+		
+		var user = new User();
+		user.set('name','testname');
+		this.newPingView = new App.Views.NewPing({model : user});
+		this.PingRenderSpy = sinon.spy(this.newPingView,'render');
+		this.newPingView.render();
+		expect(this.PingRenderSpy).toHaveBeenCalledOnce();
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html with no name",function(){
+		sinon.stub(jQuery,'ajax');
+		var user = new User();
+		sinon.stub(user,'get_users');
+		this.newPingView = new App.Views.NewPing({model : user});
+		this.PingRenderSpy = sinon.spy(this.newPingView,'render');
+		this.newPingView.render();
+		expect(this.PingRenderSpy).toHaveBeenCalledOnce();
+		
+		user.get_users.restore();
+		jQuery.ajax.restore();
+	});
+	
+	it("should have correct html rendered ",function(){
+		sinon.stub(jQuery,'ajax');
+		var user = new User();
+		this.newPingView = new App.Views.NewPing({model : user});
+		var title = this.newPingView.el.innerHTML.search('Ping User/s');
+		expect(title).toBeGreaterThan(0);
+		jQuery.ajax.restore();
+	})
+});

data/spec/javascripts/new_user_view_spec.js

@@ -0,0 +1,42 @@
+describe("NewUserView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    user = new User();
+	
+		sinon.stub(user,'create_user')
+	
+		this.newUserView = new App.Views.NewUser({model : user});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		user.create_user.restore()
+	});
+	
+	it("should have render initial html",function(){
+		this.newUserRenderSpy = sinon.spy(this.newUserView,'render');
+			
+		this.newUserView.render();
+		expect(this.newUserRenderSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should call create user",function(){
+		this.createUserRenderSpy = sinon.spy(this.newUserView,'create_user');
+		function myevent(){
+			this.preventDefault=function(){return true;}
+		}
+		e = new myevent();
+		this.newUserView.create_user(e);
+		expect(this.createUserRenderSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should have correct html rendered ",function(){
+		var title = this.newUserView.el.innerHTML.search('New user');
+		expect(title).toBeGreaterThan(0);	
+	})
+});

data/spec/javascripts/server_doc_view_spec.js

@@ -0,0 +1,39 @@
+describe("ServerDocView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    doc = new Doc();
+	
+		sinon.stub(jQuery,'ajax')
+	
+		this.serverDocView = new App.Views.ServerDoc({model : doc});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html",function(){
+		this.serverDocRenderSpy = sinon.spy(this.serverDocView,'render');
+			
+		this.serverDocView.render();
+		expect(this.serverDocRenderSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should clear doc",function(){
+		this.serverDocClearSpy = sinon.spy(this.serverDocView,'clear');
+	    doc.set('dbkey','testdbkey');
+		this.serverDocView.clear(e);
+		expect(this.serverDocClearSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should have correct html rendered ",function(){
+		var title = this.serverDocView.el.innerHTML.search('Document ');
+		expect(title).toBeGreaterThan(0);	
+	})
+});

data/spec/javascripts/set_adapter_view_spec.js

@@ -0,0 +1,32 @@
+describe("SetAdapterView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    adapter = new Adapter();
+	
+		sinon.stub(jQuery,'ajax')
+	
+		this.setAdapterView = new App.Views.SetAdapter({model : adapter});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html",function(){
+		this.setAdapterSpy = sinon.spy(this.setAdapterView,'render');
+			
+		this.setAdapterView.render();
+		expect(this.setAdapterSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should have correct html rendered ",function(){
+		var title = this.setAdapterView.el.innerHTML.search('Set Backend App URL');
+		expect(title).toBeGreaterThan(0);	
+	})
+});

data/spec/javascripts/show_device_view_spec.js

@@ -0,0 +1,41 @@
+describe("ShowDeviceView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    client = new Client();
+		client.set('device_id', 'testdeviceid');
+		client.set('user_id', 'user_id');
+	
+		sinon.stub(jQuery,'ajax')
+	
+		this.setdeviceView = new App.Views.ShowDevice({model : client});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html",function(){
+		this.setDeviceSpy = sinon.spy(this.setdeviceView,'render');
+			
+		this.setdeviceView.render();
+		expect(this.setDeviceSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should delete device",function(){
+		this.setDeviceDeleteSpy = sinon.spy(this.setdeviceView,'delete_device');
+			
+		this.setdeviceView.delete_device();
+		expect(this.setDeviceDeleteSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should have correct html rendered ",function(){
+		var title = this.setdeviceView.el.innerHTML.search("Device: testdeviceid");
+		expect(title).toBeGreaterThan(0);	
+	})
+});

data/spec/javascripts/show_user_view_spec.js

@@ -0,0 +1,46 @@
+describe("ShowUserView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    user = new User();
+	    user.set('name','testname');
+		source = new Source();
+		
+		sinon.stub(jQuery,'ajax')
+		sinon.stub(source,'fetch')
+	
+		this.showUserView = new App.Views.ShowUser({model : user});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html",function(){
+		this.showUserSpy = sinon.spy(this.showUserView,'render');
+			
+		this.showUserView.render();
+		expect(this.showUserSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should delete user",function(){
+		this.deleteUserDeleteSpy = sinon.spy(this.showUserView,'delete_user');
+		function myevent(){
+			this.preventDefault=function(){return true;}
+		}
+		e = new myevent();
+		
+		this.showUserView.delete_user(e);
+		expect(this.deleteUserDeleteSpy).toHaveBeenCalledOnce();
+	});
+	
+	it("should have correct html rendered ",function(){
+		var title = this.showUserView.el.innerHTML.search("User: testname");
+		expect(title).toBeGreaterThan(0);	
+	})
+});

data/spec/javascripts/source_docs_view_spec.js

@@ -0,0 +1,36 @@
+describe("SourceDocsView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    source = new Source();
+	    source.set("source_id",'source_id');
+		
+		sinon.stub(jQuery,'ajax')
+	
+		this.sourceDocsView = new App.Views.SourceDocs({model : source});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html",function(){
+		this.sourceDocsSpy = sinon.spy(this.sourceDocsView,'render');
+			
+		this.sourceDocsView.render('source_id');
+		expect(this.sourceDocsSpy).toHaveBeenCalledOnce();
+	});
+		
+	it("should have correct html rendered ",function(){
+		var title = this.sourceDocsView.el.innerHTML.search("Source attributes");
+		expect(title).toBeGreaterThan(0);
+		
+		var title2 = this.sourceDocsView.el.innerHTML.search("Documents for app partition");
+		expect(title2).toBeGreaterThan(0);	
+	})
+});

data/spec/javascripts/support/jasmine.yml

@@ -0,0 +1,79 @@
+# src_files
+#
+# Return an array of filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# src_files:
+#   - lib/source1.js
+#   - lib/source2.js
+#   - dist/**/*.js
+#
+src_files:
+#   - lib/rhoconnect/web-console/**/*.js
+    - lib/rhoconnect/web-console/public/jquery-1.7.1.min.js
+    - lib/rhoconnect/web-console/public/underscore.js
+    - lib/rhoconnect/web-console/public/backbone.js
+    - lib/rhoconnect/web-console/public/rhoconnect-web.js
+    - lib/rhoconnect/web-console/models/*.js
+    - lib/rhoconnect/web-console/controllers/*.js
+    - lib/rhoconnect/web-console/views/*.js
+# stylesheets
+#
+# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# stylesheets:
+#   - css/style.css
+#   - stylesheets/*.css
+#
+stylesheets:
+    - lib/rhoconnect/web-console/**/*.css
+# helpers
+#
+# Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# Default: ["helpers/**/*.js"]
+#
+# EXAMPLE:
+#
+# helpers:
+#   - helpers/**/*.js
+#
+helpers:
+ 
+# spec_files
+#
+#  Return an array of filepaths relative to spec_dir to include.
+# Default: ["**/*[sS]pec.js"]
+#
+# EXAMPLE:
+#
+# spec_files:
+#   - **/*[sS]pec.js
+#
+spec_files:
+
+# src_dir
+#
+# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# Default: project root
+#
+# EXAMPLE:
+#
+# src_dir: public
+#
+src_dir:
+
+# spec_dir
+#
+# Spec directory path. Your spec_files must be returned relative to this path.
+# Default: spec/javascripts
+#
+# EXAMPLE:
+#
+# spec_dir: spec/javascripts
+#
+spec_dir:

data/spec/javascripts/support/jasmine_config.rb

@@ -0,0 +1,23 @@
+module Jasmine
+  class Config
+
+    # Add your overrides or custom config code here
+
+  end
+end
+
+
+# Note - this is necessary for rspec2, which has removed the backtrace
+module Jasmine
+  class SpecBuilder
+    def declare_spec(parent, spec)
+      me = self
+      example_name = spec["name"]
+      @spec_ids << spec["id"]
+      backtrace = @example_locations[parent.description + " " + example_name]
+      parent.it example_name, {} do
+        me.report_spec(spec["id"])
+      end
+    end
+  end
+end

data/spec/javascripts/support/jasmine_runner.rb

@@ -0,0 +1,32 @@
+$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
+
+require 'rubygems'
+require 'jasmine'
+jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
+require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
+if Jasmine::Dependencies.rspec2?
+  require 'rspec'
+else
+  require 'spec'
+end
+
+jasmine_config = Jasmine::Config.new
+spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
+
+should_stop = false
+
+if Jasmine::Dependencies.rspec2?
+  RSpec.configuration.after(:suite) do
+    spec_builder.stop if should_stop
+  end
+else
+  Spec::Runner.configure do |config|
+    config.after(:suite) do
+      spec_builder.stop if should_stop
+    end
+  end
+end
+
+spec_builder.start
+should_stop = true
+spec_builder.declare_suites

data/spec/javascripts/users_view_spec.js

@@ -0,0 +1,35 @@
+describe("UsersView", function(){
+	
+	beforeEach(function(){
+		var session = new Session();
+		session.setAuthenticated('true');
+		session.setApiKey('testtoken');
+	    users = new User();
+		
+		sinon.stub(jQuery,'ajax')
+	
+		this.usersView = new App.Views.Users({model : users});
+	});
+	
+	afterEach(function(){
+		var session = new Session();
+		session.setAuthenticated('false');
+		session.setApiKey(null);
+		jQuery.ajax.restore();
+	});
+	
+	it("should have render initial html",function(){
+		this.usersDocsSpy = sinon.spy(this.usersView,'render');
+			
+		this.usersView.render('source_id');
+		expect(this.usersDocsSpy).toHaveBeenCalledOnce();
+	});
+		
+	it("should have correct html rendered ",function(){
+		var title = this.usersView.el.innerHTML.search("Users");
+		expect(title).toBeGreaterThan(0);
+		
+		var title2 = this.usersView.el.innerHTML.search("Create User");
+		expect(title2).toBeGreaterThan(0);	
+	})
+});

data/spec/jobs/bulk_data_job_spec.rb

@@ -24,6 +24,7 @@ describe "BulkDataJob" do
         :user_id => @u.id,
         :sources => [@s_fields[:name], 'FixedSchemaAdapter'])
       BulkDataJob.perform("data_name" => data.name)
+      BulkDataJob.after_perform_x("data_name" => data.name)
       data = BulkData.load(docname)
       data.completed?.should == true
       verify_result(@s.docname(:md) => @data,@s.docname(:md_copy) => @data)
@@ -51,6 +52,7 @@ describe "BulkDataJob" do
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
       BulkDataJob.perform("data_name" => data.name)
+      BulkDataJob.after_perform_x("data_name" => data.name)
       data = BulkData.load(docname)
       data.completed?.should == true
       verify_result(@s.docname(:md) => @data,@s.docname(:md_copy) => @data)
@@ -69,6 +71,7 @@ describe "BulkDataJob" do
           :user_id => @u.id,
           :sources => [@s_fields[:name]])
         BulkDataJob.perform("data_name" => data.name)
+        BulkDataJob.after_perform_x("data_name" => data.name)
         data = BulkData.load(docname)
         data.completed?.should == true
         verify_result(@s.docname(:md) => @data,
@@ -88,6 +91,7 @@ describe "BulkDataJob" do
           :user_id => @u.id,
           :sources => [@s_fields[:name]])
         BulkDataJob.perform("data_name" => data.name)
+        BulkDataJob.after_perform_x("data_name" => data.name)
         data = BulkData.load(docname)
         data.completed?.should == true        
         verify_result(@s.docname(:md) => @data, @s.docname(:md_copy) => @data)
@@ -107,7 +111,9 @@ describe "BulkDataJob" do
     end
 
     it "should delete bulk data if exception is raised" do
-      lambda { BulkDataJob.perform("data_name" => 'broken') }.should raise_error(Exception)
+      lambda { 
+        BulkDataJob.perform("data_name" => 'broken')
+        BulkDataJob.after_perform_x("data_name" => data.name) }.should raise_error(Exception)
       Store.db.keys('bulk_data*').should == []
     end
 
@@ -117,7 +123,9 @@ describe "BulkDataJob" do
         :app_id => 'broken',
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
-      lambda { BulkDataJob.perform("data_name" => data.name) }.should raise_error(Exception)
+      lambda { 
+        BulkDataJob.perform("data_name" => data.name)
+        BulkDataJob.after_perform_x("data_name" => data.name) }.should raise_error(Exception)
       Store.db.keys('bulk_data*').should == []
     end
   end  

data/spec/perf/bulk_data_perf_spec.rb

@@ -25,6 +25,7 @@ describe "BulkData Performance" do
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
       BulkDataJob.perform("data_name" => data.name)
+      BulkDataJob.after_perform_x("data_name" => data.name)
       lap_timer('BulkDataJob.perform duration',start)
     end
   end  

data/spec/server/server_spec.rb

@@ -27,7 +27,7 @@ describe "Server" do
 
     it "should show status page" do
       get '/'
-      last_response.body.match(Rhoconnect::VERSION)[0].should == Rhoconnect::VERSION
+      last_response.status.should == 302
     end
 
     it "should login if content-type contains extra parameters" do
@@ -427,6 +427,7 @@ describe "Server" do
         set_state('test_db_storage' => @data)
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
         last_response.should be_ok
         data = BulkData.load(bulk_data_docname(@a.id,@u.id))
@@ -439,6 +440,7 @@ describe "Server" do
         set_state('test_db_storage' => @data)
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
         get JSON.parse(last_response.body)["url"]
         last_response.should be_ok

data/spec/source_sync_spec.rb

@@ -82,7 +82,20 @@ describe "SourceSync" do
           @ss.process_query
           verify_result(@s.docname(:md) => expected)
           JSON.parse(Store.get_value(@s.docname(:schema))).should == mock_schema          
-          Store.get_value(@s.docname(:schema_sha1)) == get_sha1(mock_schema.to_json)
+          Store.get_value(@s.docname(:schema_sha1)).should == get_sha1(mock_schema['version'])
+        end
+      end
+
+      it "should raise exception if source adapter schema has no version key/value pair" do
+        mock_schema_no_version_method([SampleAdapter]) do
+          expected = {'1'=>@product1,'2'=>@product2}
+          set_state('test_db_storage' => expected)
+          @ss.process_query
+           errordoc = @s.docname(:errors)
+           errors = {}
+           Store.lock(errordoc) { errors = Store.get_data(errordoc) }
+           errors.empty?().should == false
+           errors["query-error"]["message"].should == "Mandatory version key is not defined in source adapter schema method"
         end
       end