Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated dependencies #548

Merged
merged 5 commits into from
Mar 24, 2015
Merged

updated dependencies #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f23f690
updated dependencies
SomeKittens Mar 6, 2015
01c42d2
Merge branch 'master' into update-deps
SomeKittens Mar 20, 2015
ed76aaa
Merge branch 'master' into update-deps
SomeKittens Mar 21, 2015
2fe5039
Merge branch 'master' into update-deps
Mar 24, 2015
f32971f
Updated dependencies to the latest versions and fixed tests with popo…
Mar 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ module.exports = function(grunt) {
},
options: {
watch: true,
bundleOptions: {
browserifyOptions: {
debug: true // source maps
}
}
Expand All @@ -113,7 +113,7 @@ module.exports = function(grunt) {
'client/build/js/bundle.js': ['client/main.js']
},
options: {
bundleOptions: {
browserifyOptions: {
debug: true // source maps
}
}
Expand Down
60 changes: 29 additions & 31 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,74 +40,72 @@
}
],
"dependencies": {
"101": "^0.5.0",
"angular": "1.3.12",
"101": "^0.14.0",
"angular": "1.3.15",
"angular-ui-ace": "git://github.com/Runnable/ui-ace.git#v0.2.0",
"angular-ui-router": "~0.2.10",
"ansi-to-html": "^0.2.0",
"ansi-to-html": "^0.3.0",
"async": "~0.9.0",
"brace": "git://github.com/Runnable/brace.git#0387531f7d19c8e12f1513a726695c805ad6f6b6",
"browserify": "~4.2.3",
"callback-count": "^0.1.0",
"compression": "^1.4.0",
"debounce": "https://registry.npmjs.org/debounce/-/debounce-1.0.0.tgz",
"docker-stream-cleanser": "^0.2.0",
"express": "^4.3.2",
"express": "^4.12.2",
"favico": "git+ssh://[email protected]:ejci/favico.js.git#0.3.5",
"find": "~0.1.5",
"grunt": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
"grunt-autoprefixer": "~0.7.3",
"grunt-autoprefixer": "~2.2.0",
"grunt-bg-shell": "~2.3.1",
"grunt-browserify": "^2.1.3",
"grunt-browserify": "^3.5.0",
"grunt-cli": "^0.1.13",
"grunt-concurrent": "~0.5.0",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-sass": "~0.7.3",
"grunt-concurrent": "~1.0.0",
"grunt-contrib-copy": "~0.8.0",
"grunt-contrib-jshint": "~0.11.0",
"grunt-contrib-sass": "~0.9.2",
"grunt-jade-plugin": "git://github.com/Runnable/grunt-jade-plugin.git#604fba490db0c8cf9ee4ce0c51ef91acf44ac573",
"jade": "^1.3.1",
"keypather": "^1.7.1",
"moment": "~2.7.0",
"moment": "~2.9.0",
"ngStorage": "git+https://github.com/Runnable/ngStorage.git#v0.4.0",
"node-uuid": "^1.4.1",
"node-uuid": "^1.4.3",
"primus": "^2.3.0",
"qs": "^2.2.4",
"grunt-timer": "^0.6.0",
"regexp-quote": "0.0.0",
"runnable": "git+ssh://[email protected]:CodeNow/runnable-api-client#v0.38.27",
"term.js": "git://github.com/Runnable/term.js.git#f0376add1c2e79a556834d724022ceb585b5eade",
"validate-dockerfile": "1.5.x",
"through": "^2.3.6"
"through": "^2.3.6",
"validate-dockerfile": "1.5.x"
},
"devDependencies": {
"angular-mocks": "1.3.7",
"browserify-istanbul": "^0.1.2",
"chai": "~1.9.1",
"colors": "~0.6.2",
"angular-mocks": "1.3.15",
"browserify-istanbul": "^0.2.0",
"chai": "~2.1.1",
"colors": "~1.0.3",
"coverify": "~1.0.7",
"grunt-contrib-watch": "~0.6.1",
"grunt-githooks": "~0.3.1",
"grunt-istanbul": "^0.3.0",
"grunt-istanbul": "^0.4.0",
"grunt-istanbul-coverage": "^0.1.0",
"grunt-jsbeautifier": "^0.2.7",
"grunt-newer": "^1.1.0",
"grunt-nodemon": "~0.2.1",
"karma": "~0.12.16",
"karma-browserify": "^1.0.0",
"grunt-nodemon": "~0.4.0",
"karma": "~0.12.31",
"karma-browserify": "^4.0.0",
"karma-chrome-launcher": "~0.1.4",
"karma-coverage": "0.2.6",
"karma-growl-reporter": "^0.1.1",
"karma-jasmine": "~0.2.2",
"karma-jasmine": "~0.3.5",
"karma-mocha": "~0.1.4",
"karma-mocha-reporter": "~0.2.5",
"karma-mocha-reporter": "~1.0.0",
"karma-phantomjs-launcher": "~0.1.4",
"karma-sauce-launcher": "~0.2.8",
"karma-sinon": "^1.0.3",
"karma-sourcemap-loader": "~0.2.0",
"mocha": "~1.20.1",
"nodemon": "~1.1.1",
"protractor": "~1.6.1",
"sinon": "~1.10.3"
"karma-sourcemap-loader": "~0.3.4",
"mocha": "~2.2.1",
"nodemon": "~1.3.7",
"protractor": "~1.8.0",
"sinon": "~1.14.1"
},
"browser": {
"app": "./client/lib/app.js",
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/popovers/AccountsSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function AccountsSelect(parentElement) {
this.menu = util.createGetter(by.className('popover-account-menu'));

this.isOpen = function () {
return this.menu.get().isPresent() && this.menu.get().isDisplayed();
return this.menu.get().isPresent();
};

this.getAccountSelector = function (username) {
Expand All @@ -23,7 +23,7 @@ function AccountsSelect(parentElement) {
}
}).then(function () {
return browser.wait(function () {
return self.menu.get().isDisplayed();
return self.menu.get().isPresent();
});
});
};
Expand All @@ -33,7 +33,7 @@ function AccountsSelect(parentElement) {
return this.openIfClosed(
).then(function () {
return browser.wait(function () {
return self.getAccountSelector(username).isPresent() && self.getAccountSelector(username).isDisplayed();
return self.getAccountSelector(username).isPresent();
});
}).then(function () {
return self.getAccountSelector(username).click();
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/popovers/GearMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function GearMenu() {
this.modalDelete = util.createGetter(by.buttonText('Delete Server'));

this.isOpen = function() {
return this.menu.get().isPresent() && this.menu.get().isDisplayed();
return this.menu.get().isPresent();
};

this.openIfClosed = function() {
Expand All @@ -32,7 +32,7 @@ function GearMenu() {
}
}).then(function() {
return browser.wait(function() {
return self.renameItem.get().isDisplayed();
return self.renameItem.get().isPresent();
});
});
};
Expand All @@ -43,7 +43,7 @@ function GearMenu() {

self.renameItem.get().click();
browser.wait(function() {
return self.modalRename.input.get().isDisplayed();
return self.modalRename.input.get().isPresent();
});

self.modalRename.input.get().clear();
Expand All @@ -57,7 +57,7 @@ function GearMenu() {

self.deleteItem.get().click();
browser.wait(function() {
return self.modalDelete.get().isDisplayed();
return self.modalDelete.get().isPresent();
});
self.modalDelete.get().click();
};
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/popovers/GithubCommitMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ function GithubCommitMenu(repo, index) {
};

this.open = function (repo) {
browser.wait(repo.isDisplayed);
browser.wait(repo.isPresent);
repo.click().then(function () {
browser.wait(self.isOpen);
});
};

this.isOpen = function () {
return self.commitMenu.get(thisIndex).isDisplayed();
return self.commitMenu.get(thisIndex).isPresent();
};

this.changeCommit = function (index) {
var commitList = this.getCommitList(self.commitMenu.get(thisIndex));
var commit = commitList.get(index);
browser.wait(function () {
return commit.isDisplayed();
return commit.isPresent();
});
commit.getWebElement().click();
};
Expand Down
28 changes: 0 additions & 28 deletions test/karma.circle.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,6 @@

var istanbul = require('browserify-istanbul');

var customLaunchers = {
sl_chrome: {
base: 'SauceLabs',
browserName: 'chrome',
platform: 'Windows 7'
},
sl_firefox: {
base: 'SauceLabs',
browserName: 'firefox',
version: '27'
},
sl_ios_safari: {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.9',
version: '7.1'
},
sl_ie_11: {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
}
};

module.exports = function(config) {
config.set({

Expand All @@ -41,9 +16,6 @@ module.exports = function(config) {
testName: 'Runnable 2.0'
},

customLaunchers: customLaunchers,

// browsers: Object.keys(customLaunchers),
// browsers: ['Chrome'],
browsers: ['PhantomJS'],

Expand Down
28 changes: 0 additions & 28 deletions test/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,6 @@

var istanbul = require('browserify-istanbul');

var customLaunchers = {
sl_chrome: {
base: 'SauceLabs',
browserName: 'chrome',
platform: 'Windows 7'
},
sl_firefox: {
base: 'SauceLabs',
browserName: 'firefox',
version: '27'
},
sl_ios_safari: {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.9',
version: '7.1'
},
sl_ie_11: {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
}
};

module.exports = function(config) {
config.set({

Expand All @@ -40,9 +15,6 @@ module.exports = function(config) {
testName: 'Runnable 2.0'
},

customLaunchers: customLaunchers,

// browsers: Object.keys(customLaunchers),
// browsers: ['Chrome'],
browsers: ['PhantomJS'],

Expand Down