fixed ptor

Gruntfile.js

@@ -631,7 +631,7 @@ module.exports = function (grunt) {
 		}
 	});
 
-
+grunt.registerTask('ptor', ['coffee:test', 'protractor_webdriver', 'protractor']);
 	grunt.registerTask('build-docs', [ 'useminPrepare', 'autoprefixer', 'concat', 'ngmin']);
 	grunt.registerTask('build', ['clean:dist', 'useminPrepare', 'concurrent:dist', 'autoprefixer', 'concat', 'ngmin', 'copy:dist', /*'cdnify',*/ 'cssmin', 'uglify', 'rev', 'usemin']);
 

protractor.conf.js

@@ -1,21 +1,26 @@
+
 // An example configuration file.
 exports.config = {
 	baseUrl: 'http://localhost:9000',
   // The address of a running selenium server.
-  //seleniumAddress: 'http://localhost:4444/wd/hub',
+  seleniumAddress: 'http://localhost:4444/wd/hub',
 	// ---- 3. To use remote browsers via Sauce Labs -----------------------------
   // If sauceUser and sauceKey are specified, seleniumServerJar will be ignored.
   // The tests will be run remotely using Sauce Labs.
-  sauceUser: process.env.SAUCE_USERNAME,
-  sauceKey: process.env.SAUCE_ACCESS_KEY,
+  //sauceUser: SAUCE_USERNAME,
+  //sauceKey: SAUCE_ACCESS_KEY,
   // Use sauceSeleniumAddress if you need to customize the URL Protractor
   // uses to connect to sauce labs (for example, if you are tunneling selenium
   // traffic through a sauce connect tunnel). Default is
-  sauceSeleniumAddress: 'ondemand.saucelabs.com:80/wd/hub',
+  //sauceSeleniumAddress: 'http://localhost:4445/wd/hub',
 
   // Capabilities to be passed to the webdriver instance.
   capabilities: {
-    'browserName': 'chrome'
+		'name': 'AngularCMS',
+    'browserName': 'chrome',
+		'chromeOptions': {
+    	'args': ['show-fps-counter=true']
+  	}
   },
 
 	params: {
@@ -35,12 +40,8 @@ exports.config = {
     defaultTimeoutInterval: 30000
   },
 	onPrepare: function(){
-		browser.driver.get(browser.params.baseUrl);
-
+		//browser.driver.get(browser.params.baseUrl);
 		var SpecReporter = require('jasmine-spec-reporter');
     jasmine.getEnv().addReporter(new SpecReporter({displayStacktrace: true}));
-	},
-	onComplete: function () {
-		browser.driver.close();
 	}
 };

test/protractor/app-spec.coffee

@@ -80,11 +80,8 @@ loginPage = null
 Protractor e2e Tests
 ###
 describe "Angular-CMS App", ->
-  App = new AppPage()
-  registerPage = new RegisterPage()
-  loginPage = new LoginPage()
-
   beforeEach ->
+    App = new AppPage()
 		App.get()
 
 	#Welome Story: the initial page
@@ -112,6 +109,7 @@ describe "Angular-CMS App", ->
   ###
 	describe 'Register: ', ->
 		it 'should have email and password inputs with a button to submit the form', ->
+      registerPage = new RegisterPage()
       registerPage.get()
 			expect(driver.getCurrentUrl()).toContain 'register'
 			expect(j$.element('form', 'Login form').count()).toEqual 1
@@ -127,6 +125,7 @@ describe "Angular-CMS App", ->
 
 		#Click the login button each time
 		beforeEach ->
+      loginPage = new LoginPage()
 			element('a[href="#/login"]', 'Login button').click()
 
 		#Make sure we end up at the login page to enter our credentials
@@ -149,6 +148,7 @@ describe "Angular-CMS App", ->
 	#The dashboard implementation
 	describe 'Dashboard: viewing the dashboard...', ->
 		beforeEach ->
+      loginPage = new LoginPage()
 			loginPage.login('[email protected]', 'test')
 			browser.sleep 1
 		it 'should have a link to the profile page', ->